[Top][All Lists]

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

stripping keywords on commit?

From: Ted Stern
Subject: stripping keywords on commit?
Date: Mon, 01 Oct 2007 15:50:10 -0700
User-agent: Gnus/5.110007 (No Gnus v0.7) Emacs/22.1.50 (gnu/linux)


I am finding Keyword expansion problematic in certain contexts.  In
particular, merging changes between branches.  For example, say I have
$Id$ in a file, and I've checked it out in two different branches.
When I try to merge modifications on a file in a branch into another
branch, I get a spurious conflict on the $Id: ...$ line.

I don't really care about the difference in the $Id$ or $Name$
expanded keyword when merging.  Such keywords are in comments, and
aren't relevant to the code change.  And besides that, an $Id$ header
isn't essential for keeping track of changes -- all that information
is available directly from the repository.  The real importance of the
tag is that it tells someone looking at the file where it came from,
even if it has been copied somewhere else as part of an installation
or is being examined out of CVS context.

So what I'd like is some way of stripping down headers on commit to
their minimal form.  I.e., $Id: ...$ => $Id$.  Exactly what you'd
expect on checkout with the -kk flag.

There seem to be plenty of ways to change keyword expansion on
checkout, update or admin, but no way to change keyword expansion on

Any ideas?

 dodecatheon at gmail dot com
 Frango ut patefaciam -- I break so that I may reveal

reply via email to

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