Working with Subversion

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Mon Feb 18 02:07:47 CST 2008


> Sure. Did you use it in practice ? I am not sure what it buys you, trading MQ and 3-way merge for named branches and transplant.

Can you elaborate on transplant not supporting 3-way merge? I may be
mistaken, but it seems to me that in A->B, A->C, when you transplant B
so that you get A->C->B, this is rather like a 3-way merge as you take
the diff of B vs A and see if it applies cleanly to C, which is also
based on A. I do realize that this would not give you a visual 3-way
merge. But then, couldn't transplant be made to support this when
there are conflicts? After all, it can find the common parent.

-peo


More information about the Mercurial mailing list