Hi, 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...
Dirk
--
Dirk Heinrichs | Tel: +49 (0)211 56623 316
Configuration Manager | Fax: +49 (0)211 56623 450
Capgemini Deutschland | Mail: dirk.heinri...@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.
signature.asc
Description: signature.asc
