Working with Subversion

[Patrick Mézard]

Peter Arrenbrecht a écrit :
>> 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.

Visual or not that's what I meant. Patching should work most of the time, but when it fails with large patches, fixing it manually is more time consuming than merging. As for supporting merging in transplant, that would almost give us a rebase command.

--
Patrick Mézard