Prabhu Gnana Sundar <prabh...@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 http://www.uberSVN.com
