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

Re: Bogus mergeinfo in trunk

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Tue, 02 Aug 2011 17:24:58 +0100

Prabhu Gnana Sundar <prabhugs_at_collab.net> writes:

>> but there are subtree mergeinfo changes that are harder to understand.
>> For subversion/libsvn_subr/svn_temp_serializer.c the change is:
>> Added: svn:mergeinfo
>> Merged /subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:r1067687-1072301
>> which refers to trunk not branches/performance, I don't think that is
>> correct. svn_temp_serializer.c didn't exist on trunk before 1072303, it
>> was created on the performance branch and merged/copied to trunk in
>> 1072303, so that may be what caused the error.
> I tried to replicate the same scenario in my dev box, yet could not
> bring this suspicious mergeinfo
> in place.
> I have even tried to merge the "trunk" instead of the "performance"
> branch. So this seems like some
> sort of manually set property.

It seems to be reproducible with a 1.7 client:

$ svn co http://.../trunk@1081135 wc
$ svn merge --record-only http://.../branches/performance@1081135 -r1067696:1078365 wc
$ svn diff wc/subversion/libsvn_subr/svn_temp_serializer.c
Index: wc/subversion/libsvn_subr/svn_temp_serializer.c
--- wc/subversion/libsvn_subr/svn_temp_serializer.c (revision 1081135)
+++ wc/subversion/libsvn_subr/svn_temp_serializer.c (working copy)

Property changes on: wc/subversion/libsvn_subr/svn_temp_serializer.c
Added: svn:mergeinfo
   Merged /subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:r1067687-1072301

uberSVN: Apache Subversion Made Easy
Received on 2011-08-02 18:25:33 CEST

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

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