On Wed, 2007-12-12 at 19:56 -0700, Robert Dodier wrote:
> Hmm, this seems more complicated than it needs to be.
> cvs update -r whatever-tag-or-branch -dP
> changes the sandbox files to the tagged version.
> cvs update -dAP
> makes cvs forget the tag and go back to the trunk.
> Those commands can be applied to a single directory or file.
> So it's really not necessary to maintain two separate sandboxes;
> it should be enough to use cvs update to switch between the
> branch and the trunk. But if someone is more happier with
> two sandboxes, then I certainly won't stop them.
That's what I used to do until the 5.12 release.
Right after 5.12.0 was released (around 2007/05/03) I noticed that all
of the changes I have made in the 5_12_0 branch were not present in the
post 5.12.0 CVS version. Look for instance at
interfaces/xmaxima/Tkmaxima/RunMaxima.tcl
the changes in the branch 5_12_0 (1.29.4.1 and 1.29.4.2) only made it to
the main branch about a month after the 5.12.0 release (1.30) when I
realized that the changes in branch 5_12_0 were not present in the main
branch after the release and I committed a new version.
Did I miss something? how do you guarantee that the changes you commit
in the release branch enter also the main branch after the release?
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?
Regards,
Jaime