On Fri, Feb 20, 2004 at 04:49:31PM -0000, Euan Guttridge wrote:
> Thanks but the exercise is too strip out the [CVS-keyword] line completely - reason
> being
> to minimise unnecessarily checking of code 'conflicts' while merging with
> eclipse.
You could roll your own with something like (untested):
$ perl -I.bak -p e 's/\$Id:[^$]*\$//' [files...]
But look again at the "-kk" suggestion; it might do what you
want. If you merge with "-kk", then instead of:
$Id: stuff $
you'll get precisely the string:
$Id$
in each of the revisions used as inputs to the merge. Since it's
the same line in all three files, there should be no merge
conflict.
Note, though, that as a side effect, merging with "-kk" will
stickily set all the files in your sandbox to "-kk" mode.
*After* you commit the merge, you'll have to do a "cvs up -A" to
restore them.
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. [EMAIL PROTECTED]
| | /
It must be said that they would have sounded better if the singer
wouldn't throw his fellow band members to the ground and toss the
drum kit around during songs.
- Patrick Lenneau
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
