We have the same difficulty here, but no clean solution. I also hope that
someone out there can help.
On the one hand, this behaviour forces you to manually review the merge,
which is not always a bad thing. But it is unecessarily tedious!!!
TIA,
Nestor
-----Original Message-----
From: Martin Apel [mailto:[EMAIL PROTECTED]]
Sent: Tuesday, June 27, 2000 12:38 PM
To: [EMAIL PROTECTED]
Subject: Keyword substitution during update
Hi, all
I have a problem updating files in a branch containing keywords.
Those files contain something like:
# Version : $Revision: 1.10.4.1 $
before the update. Updating generates a conflict like the following:
<<<<<<< Rvr.make
# Version : $Revision: 1.10.4.1 $
=======
# Version : $Revision: 1.12 $
>>>>>>> 1.12
This happens for the keywords Id, Date and Revision. When updating
the whole branch this leads to endless conflicts, I have to resolve by hand.
Does anybody know a way around this?
Martin
----------------------------------------------------------------------------
Martin Apel phone: ++49.6301.606.300
Human Modeling fax: ++49.6301.606.309
TECMATH AG email: [EMAIL PROTECTED]
Sauerwiesen 2
67661 Kaiserslautern, Germany
----------------------------------------------------------------------------
