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

Re: Strange merge problem

From: Alfred von Campe <alfred_at_von-campe.com>
Date: Sun, 17 Jul 2016 21:35:20 -0400

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_at_von-campe.com> wrote:
>
> On Jul 15, 2016, at 3:02, Stefan Sperling <stsp_at_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
Received on 2016-07-18 03:35:36 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.