[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] stamping files with revision id's.
|
From: |
Robert Collins |
|
Subject: |
Re: [Gnu-arch-users] stamping files with revision id's. |
|
Date: |
Mon, 20 Oct 2003 07:32:27 +1000 |
On Mon, 2003-10-20 at 07:15, Florian Weimer wrote:
> In-file revision IDs have been removed from the GCC tree due to constant
> breakage in merges.
UHm, CVS provides -kk which grabs and diffs files with the $Id: ....$
set to $Id: $, which eliminates those spurious conflicts. Gotta say that
whoever has been merging hasn't been using CVS the right way. Check out
Henrik Nordstroms CVS scripts that we use for merging in the squid
developers CVS repository on devel.squid-cache.org.
Rob
--
GPG key available at: <http://members.aardvark.net.au/lifeless/keys.txt>.
signature.asc
Description: This is a digitally signed message part