[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: Dirk Heinrichs <dirk.heinrichs_at_capgemini.com>
Date: Fri, 10 Jun 2011 07:27:59 +0200

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.



Dirk Heinrichs          | Tel:  +49 (0)211 56623 316
Configuration Manager   | Fax:  +49 (0)211 56623 450
Capgemini Deutschland   | Mail: dirk.heinrichs_at_capgemini.com
Wanheimerstra├če 68      | Web:  http://www.de.capgemini.com
D-40468 D├╝sseldorf      | ICQ#: 110037733
GPG Public Key C2E467BB | Keyserver: wwwkeys.pgp.net
Firma: Capgemini Deutschland GmbH
Geschaeftsfuehrer: Dr. Michael Schulte (Vorsitzender), Sven Breipohl, Burkhard Kehrbusch, Peter Laggner, Josef Ranner
Amtsgericht Berlin-Charlottenburg, HRB 98814
This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is 
intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to 
read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message 
in error, please notify the sender immediately and delete all copies of this message.
Received on 2011-06-10 07:28:40 CEST

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

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