[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging the same version again and again and again and again and ...
From: |
Jim Hyslop |
Subject: |
Re: merging the same version again and again and again and again and ... |
Date: |
Tue, 11 Apr 2006 08:18:36 -0400 |
User-agent: |
Mozilla Thunderbird 1.0.6 (Windows/20050716) |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Harald Dunkel wrote:
> Hi folks,
>
> How comes that CVS assumes that some versions in 2 branches
> have to be merged again, even though the previous merge and
> checkin happened just a few jiffies before, and no file has
> been modified since then?
>
> % cvs update -j cde2006_hop1 README
[...]
> % cvs commit -m ""
> cvs commit: Examining .
> % cvs update -j cde2006_hop1 README
CVS assumes nothing. You *told* it to merge the same file again and
again. You may only omit the second -j option on the first merge. The
second and subsequent merges must provide both -j options.
By the way, the better list for this type of question is
info-cvs@nongnu.org.
- --
Jim Hyslop
Dreampossible: Better software. Simply. http://www.dreampossible.ca
Consulting * Mentoring * Training in
C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFEO56cLdDyDwyJw+MRAiaUAJ9RGvdrEfK579wX9e2LL/+0TBTwMACgggFw
jjvcHmRsixlUSHvCbPnk8ME=
=seVC
-----END PGP SIGNATURE-----
- merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/11
- Re: merging the same version again and again and again and again and ...,
Jim Hyslop <=
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/11
- Re: merging the same version again and again and again and again and ..., Jim Hyslop, 2006/04/13
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/18
- Re: merging the same version again and again and again and again and ..., Ingolf Steinbach, 2006/04/19
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/21
- Re: merging the same version again and again and again and again, Larry Jones, 2006/04/21
Re: merging the same version again and again and again and again and ..., Larry Jones, 2006/04/11