On Fri, Jun 10, 2011 at 07:27:59AM +0200, Dirk Heinrichs wrote: > Am 09.06.2011 16:42, schrieb Bob Archer: > >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. > > > OK, but how do I get rid of this, it's really irritating for the users.
Hi Dirk, this question comes up frequently on this list, most recenlty here: http://svn.haxx.se/users/archive-2011-06/0081.shtml (see the bottom of that post) Long story short: Upgrate your users to 1.7.0 clients once 1.7.0 is released and this problem will go away.
