[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: Path not found on merge

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Mon, 6 Apr 2015 21:22:35 -0700 (PDT)

On 7/04/2015 14:50, Ben Fritz wrote:
> I saw the same error message, when I had this situation:
> 1. Create branchA from trunk at revision 123
> 2. Do some work on branchA, up to revision 124
> 3. Revision 125 created on trunk
> 4. Merge revision 125 to branchA
> 5. Create branchB from revision 125 on trunk
> 6. Merge branchA to branchB as an automatic merge, by not specifying a
> revision
> I worked around this issue by specifying an explicit revision range in step
> 6 instead of doing an auto merge. But I'd certainly like to know what was
> going on.

The automatic merging gets completely confused when you are trying to merge sibling or unrelated branches instead of direct parent/child relationships.

I believe this is because of the way that SVN branches are paths and the mergeinfo is stored by path in the properties.

So in the above sequence, step 6 has issues because branchA is neither one of the ancestors of branchB nor does it contain previous merges from branchB.

In Git it wouldn't be a problem because branches are just refs, so in step 5 you are creating two aliases for exactly the same thing. In SVN however in step 5 you are copying trunk to another path in revision 126, and this new copy is not the same as trunk itself (eg. it will have different mergeinfo).


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-04-07 06:22:38 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.