subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alfred von Campe <alf...@von-campe.com>
Subject Re: Strange merge problem
Date Mon, 18 Jul 2016 01:35:20 GMT
So is it me or is there something broken here?  A quick recap:

$ 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]

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

Alfred


> On Jul 15, 2016, at 6:10, Alfred von Campe <alfred@von-campe.com> wrote:
> 
> On Jul 15, 2016, at 3:02, Stefan Sperling <stsp@elego.de> wrote:
> 
>> I'm afraid it's not obvious to me what issue you are referring to.
>> 
>> Which behaviour are you expecting, and how does Subversion not meet
>> your expectations?
> 
> I expect Subversion to merge only revisions 29203:HEAD of branchA into
> branchB.  Why is it trying to merge everything from the youngest
> common ancestor when the svn:mergeinfo property (after I manually
> edited it) indicates that revisions 15542-29203 have already been
> merged?
> 
> Alfred


Mime
View raw message