-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mark Hoogenboom wrote: > Right - with latest-good-tag-from-the-branch on the branch, things start to > make > sense. To update a branch with the latest changes in the trunk, I would say: > > 1. Tag the latest revisions in the trunk: > cvs rtag tag2 mymodule > > 2. Update the sandbox containing the branch (where tag1 is the tag from the > previous loop) > cvs update -j tag1 -j tag2 > > 3. Solve conflicts and commit.
Almost there. How do you populate the working directory used in step 2? - -- 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 iD8DBQFDlHOOLdDyDwyJw+MRAu6nAJ962GTWQyKD5BhaIn6dkvs5r9ZJpACgr7fu AHUPBPr7BeoPACEgOxQ7Xok= =dqWo -----END PGP SIGNATURE----- _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
