Re: Strange merge problem

> $ svn pg svn:mergeinfo | grep branchA
> /branches/branchA:28000-29203
> $ svn pe svn:mergeinfo .
> Set new value for property 'svn:mergeinfo' on '.'
> $ svn pg svn:mergeinfo | grep branchA
> /branches/branchA:15542-29203
> $ svn mergeinfo ^/branches/branchA --show-revs=eligible
> [100’s of revisions starting at 15544 including a
> dozen or so expected ones after revision 29203]

Commonly caused by explicit subtree mergeinfo. Check for svn:mergeinfo properties set on subtrees for both the merge source and the merge target.

> Somehow the merge info data got corrupted for these
> branches and I attempted to fix it by manually editing
> the svn:mergeinfo property.

Ideally use svn cli UI only.

Andreas
Received on 2016-07-18 09:00:21 CEST