-----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 [EMAIL PROTECTED] - -- 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----- _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
