[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging while ignoring revision numbers.
|
From: |
Mark D. Baushke |
|
Subject: |
Re: Merging while ignoring revision numbers. |
|
Date: |
Fri, 14 Mar 2008 08:32:41 -0700 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Frank Petrillo <address@hidden> writes:
> Is it possible to merge files and ignore the revision numbers/ancestor?
One typically does this by doing the merge with -kk rather -kkv on the
cvs update line. This causes things like $Id: ... $ to be kept as $Id$
during and after the merge.
-- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)
iD8DBQFH2pqZCg7APGsDnFERAoPcAKCW5tdDFe+AnIh25RqGBkY9EN0RYQCfQUnR
c2OM6gjdY+Enuhe1DTu7+q8=
=wV3n
-----END PGP SIGNATURE-----