On 12/13/07, Jaime Villate <villate at fe.up.pt> wrote:
> how do you guarantee that the changes you commit
> in the release branch enter also the main branch after the release?
"cvs update -j some-revision" merges the indicated revision into
your sandbox. E.g. after working on a branch, to merge the changes
into the trunk: commit the stuff on the branch, cvs update -dAP to
change your sandbox to the trunk, cvs update -j my-branch,
resolve any merge conflicts, then commit on the trunk.
Copying files from one sandbox to another can clobber changes
that have been committed in the copied-to location.
So even if you maintain separate sandboxes, "cvs update -j"
is the better way to copy the changes from one to the other.
> And if you change the tag in your sandbox, how do you get the files
> that have been committed only in the main branch and not in the
> release branch?
"cvs update -dAP" makes cvs forget about the branch or any
other tag and retrieve the trunk revisions.
HTH
Robert