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

RE: Strange merge behaviour

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 9 Jun 2011 10:42:42 -0400

> I'm facing a problem where I get items modified by a merge although
> there should be nothing to merge at all.
>
> I create a new branch from trunk.
> I checkout from that new branch.
> I merge from trunk into the new branch.
>
> [ No intermediate commit did happen as I'm doing this on a personal
> backup copy of the repository. ]
>
> svn status now shows some modified elements, and if I look at them
> with svn diff, I get something like
>
> Property changes on: path/to/file
> ___________________________________________________________________
> Modified: svn:mergeinfo
> Merged /project/trunk/path/to/file:r1234
>
> Why is this and how can I get rid of this strange behaviour?
>
> Thanks...

Check to see if prior to your merge that file already had merge info on it. If it does then the merge info will be updated on that item, even if that item is not modified by the diff.

BOb
Received on 2011-06-09 16:43:17 CEST

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