-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cloud Burst wrote: > This means you did a "cvs up -r1.2 filename.sh" at some time in the past > and probably forgot you did that. You need to rename filename.sh (or > make a backup of it somehow) and refresh it with "cvs up -A filename.sh" > (assuming you want the trunk). Then make your changes again, or just > copy your backup on top of the new filename.sh, and then commit.
NO! Do not do copy your backup file!! If you copy your backup on top of filename.sh, and anyone else has modified the file, then all the changes they have made will be lost. 'cvs update -A' or 'cvs update -r[branch-tag]' is the correct way to go. CVS will automatically merge any changes. - -- 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 iD8DBQFEBcdHLdDyDwyJw+MRAljzAKCk3JDQCOw7TB7zfSF/awDhg0bRoACeJAQx 1EcazL22dyBEiieMdfhnsGk= =X82T -----END PGP SIGNATURE----- _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
