all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* deleting rcs keywords from emacs sources
@ 2004-03-23  6:46 Miles Bader
  2004-03-23  7:47 ` Eli Zaretskii
                   ` (2 more replies)
  0 siblings, 3 replies; 30+ messages in thread
From: Miles Bader @ 2004-03-23  6:46 UTC (permalink / raw)


A few files in the emacs source have embedded `rcs keywords', which look
like $Id: ... $ and are rewritten by cvs upon checkout/checkin (I'm not
entirely sure which) to automatically reflect 

These are quite annoying when merging between branches because they
cause spurious conflicts (as they contain the revision number, they are
guaranteed to differ between branches), and as far as I know aren't
really particularly useful, so I'd like to simply delete them from the
emacs sources.

Any objections?

-Miles
-- 
97% of everything is grunge

^ permalink raw reply	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2004-03-25  8:17 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-23  6:46 deleting rcs keywords from emacs sources Miles Bader
2004-03-23  7:47 ` Eli Zaretskii
2004-03-23 10:56   ` Kim F. Storm
2004-03-23  9:51 ` spiegel
2004-03-23 10:16   ` Miles Bader
2004-03-23 11:41   ` Juanma Barranquero
2004-03-23 13:13     ` Miles Bader
2004-03-23 14:01       ` Juanma Barranquero
2004-03-23 14:35         ` Miles Bader
2004-03-23 14:58           ` Juanma Barranquero
2004-03-23 15:14             ` Stefan Monnier
2004-03-23 15:36               ` Juanma Barranquero
2004-03-23 23:38                 ` deleting rcs " David Kastrup
2004-03-24  5:34             ` deleting rcs keywords " Richard Stallman
2004-03-23 15:04         ` Stefan Monnier
2004-03-23 15:39           ` Wheter to switch to another VC, and which one Juanma Barranquero
2004-03-23 16:25             ` Stefan Monnier
2004-03-23 16:43               ` Masatake YAMATO
2004-03-23 17:17                 ` Stefan Monnier
2004-03-23 17:31                   ` Masatake YAMATO
2004-03-23 18:50                     ` Stefan Monnier
2004-03-24  0:17             ` Kim F. Storm
2004-03-23 23:35               ` Miles Bader
2004-03-24 10:52                 ` Kim F. Storm
2004-03-24 10:24                   ` Miles Bader
2004-03-24 17:48               ` Stefan Monnier
2004-03-23 18:17       ` deleting rcs keywords from emacs sources Nick Roberts
2004-03-23 18:07     ` Nick Roberts
2004-03-24  5:34 ` Richard Stallman
2004-03-25  8:17   ` Miles Bader

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.