-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Roger Ye wrote: > Hi all, > > Here I have a branch prod_dev (not head), and prod_dev itself also has > a branch named prod_dev_br, now some changes are made on the > sub-branch prod_dev_br, and I want to merge the changes back to > the branch prod_dev, and any changes made on the sub-branch should > be ignored, then is it possible to execute a single cvs command to achieve > this? I have already checked out the project from branch prod_dev > > Afterwards can I use the following command to merge/override? > cvs up -CdP -jprod_dev_br my-module Yes, except that you don't specify 'my-module'.
> Is it the same as the following one? > cvs up -CdP -jprod_dev -jprod_dev_br my-module Again, don't specify 'my-module'. No, that will do something different: it will make prod_dev identical to prod_dev_br, and you will lose any changes on prod_dev after the branch was created. > Or I must have a tag which marks where the sub-branch was made? By specifying only one -j option, CVS will automatically determine where the branch was made. > The second question is if lots of changes have been made on > the sub-branch, especially in case of many new dirs and new files, > how can I quickly commit all the changes to the branch prod_dev? > how do you guys performed such operation? 'cvs ci' and you're done. - -- 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 iD8DBQFDqEdpLdDyDwyJw+MRAgkOAJ96aQMODRYePyVqYqfu8f71qtnvkQCcD5e3 iSFyFKJZBI3WV/eDyY5DfvY= =XRx7 -----END PGP SIGNATURE----- _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
