[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: |
Florian Weimer |
|
Subject: |
Re: [Gnu-arch-users] stamping files with revision id's. |
|
Date: |
Sun, 19 Oct 2003 23:37:23 +0200 |
|
User-agent: |
Mutt/1.5.4i |
Robert Collins wrote:
> 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.
Of course it can be worked around, but most developers agreed that
per-file revision IDs are not worth the trouble.
Things get worse in the arch context because changesets aren't per file
anymore.