[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Merging, keyword expansion, binary files

From: Nicholas Catanchin
Subject: Merging, keyword expansion, binary files
Date: Wed, 19 Dec 2001 09:53:39 +1000


I'm trying to perfect my tracking of third-party sources and I think I
have stumbled into my last problem :)
The third-party software that I am using is modified/enhanced on a daily
basis and I really want to stay up to date with it. The process I am
going through is:

1. Checkout latest version of third-party source
2. Import into vendor branch with new release tag (using date of import
as release tag)
3. Merge changes together

Problem starts here. Merge works fine (thanks to Larry) except that
every file that has been modified has a conflict due to the $Id$ keyword
being present. I read up on this and found that I can specify the '-kk'
option on merge to set the keyword to not expand (or something like
that). That worked fine - except that all the binary files present get
screwed up. But then when I go to commit the merged sources the binary
files that have just been corrupted are not committed for some reason
(is this a feature?). SO - problem solved? Or not?

Thanks in advance.

Nicholas Catanchin
Riders Cyclery
579 Kessels Road, Macgregor QLD 4109
Phone: (07) 3849 5333

reply via email to

[Prev in Thread] Current Thread [Next in Thread]