all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Miles Bader <miles@gnu.org>
Cc: emacs-devel@gnu.org, Miles Bader <miles@gnu.org>
Subject: Re: RCS keyword removal
Date: Sun, 11 Apr 2004 11:51:30 -0400	[thread overview]
Message-ID: <20040411155130.GA30439@fencepost> (raw)
In-Reply-To: <1081696710.770.115.camel@localhost>

On Sun, Apr 11, 2004 at 05:18:30PM +0200, Andre Spiegel wrote:
> On Sat, 2004-04-10 at 08:00, Miles Bader wrote:
> 
> > The ones I _didn't_ remove were in vc-*.el
> 
> Could you tell me what specific operations they cause you trouble with? 
> (Others who are having trouble with version headers, please also
> respond.)

With merging between different branches outside of CVS.  A merge is done, and
then the merged branches reconciled with CVS -- which changes the keywords,
and causes more spurious changes, which then end up becoming part of the long
term branch state.  These are then are persistant sources of merge conflicts
in future merges.

Ideally I could globally use the CVS -kb option on checkout/update to prevent
all keyword expansion, but the CVS docs are very unclear on the actual effect
of that, e.g what would the actual value of existing embedded keywords (in
existing code, or new code committed by people who _didn't_ globally force
-kb, i.e., most people)?

-Miles
-- 
"Whatever you do will be insignificant, but it is very important that
 you do it."  Mahatma Ghandi

  reply	other threads:[~2004-04-11 15:51 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-04-10  6:00 RCS keyword removal Miles Bader
2004-04-11 15:18 ` Andre Spiegel
2004-04-11 15:51   ` Miles Bader [this message]
2004-04-11 16:06     ` Andreas Schwab
2004-04-11 17:16     ` Andre Spiegel
2004-04-12  1:48       ` Miles Bader
2004-04-12  9:14         ` Andre Spiegel
2004-04-12  9:27           ` Miles Bader
2004-04-13  9:10           ` Miles Bader
2004-04-13  9:29             ` Andre Spiegel
2004-04-13 10:00               ` Miles Bader
2004-04-12 21:28         ` Kim F. Storm
2004-04-13  1:18           ` Miles Bader

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040411155130.GA30439@fencepost \
    --to=miles@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.