[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: Sulser, Timothy \(IFPRI\) <T.SULSER_at_CGIAR.ORG>
Date: Thu, 9 Jun 2011 10:30:17 -0400

Context:

-----Original Message-----
From: Heinrichs, Dirk [mailto:dirk.heinrichs_at_capgemini.com]

...

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?

Comments:
Each and every event in a project get a revision number, and a merge is definitely an event that gets recorded by SVN. SVN tries to be omniscient within a project so even if the code isn't changing in a merge event, the increment in revision number and the reason behind the increment still needs to get recorded.

I don't think you'll be able to get rid of that behavior unless you change your strategy for making personal backups.

Best,

-Tim
Received on 2011-06-09 16:31:24 CEST

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