-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 LennardL wrote: > so, is there a way to commit files without merging? or does anybody knows a > workaround for this 'workflow'? No to the first question. The only workaround I know of is to rename the file about to be updated, then update, then rename the file back. If you do decide to take this approach, then I strongly urge you NOT TO CALL IT A CVS CLIENT!!
The whole point of version management systems is to merge and integrate changes made in various branches. That's why the "C" in "CVS" stands for "Concurrent" - multiple developers can concurrently change files, confident that their changes will not get lost. If you call your software a CVS client, then I guarantee someone will be bitten by your unorthodox approach. - -- 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.8 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAknLa3kACgkQLdDyDwyJw+O0KwCg7r4bRboeMC2tYa37EHZTFURp Jj4AoIHKoocWRmBd+Ptzc99Ub0KGS+ly =Aqbb -----END PGP SIGNATURE-----
