Re: [Bug-gnubg] 0.13.x branched in CVS

[Gary Wong]

On Thu, Jan 16, 2003 at 03:30:27PM +0100, Achim Mueller wrote:
> Sorry for the questions, but I'm too tired at the moment to read the big
> cvs documentation. I use a small script for getting the current sources:
> 
> export CVS_RSH=ssh
> export address@hidden:/cvsroot/gnubg
> cd $HOME/local/src
> cvs -z3 address@hidden:/cvsroot/gnubg co gnubg
> 
> 
> 1. How do I change it to get the new stable and the devel tree?

Do you mean that you want to be able to choose at runtime which branch
to update, or do you mean that you want local copies of each of the
branches, and you want the script to update them both?  Assuming the
latter, then:

    export CVS_RSH=ssh
    export address@hidden:/cvsroot/gnubg
    cd $HOME/local/src
    cvs -z3 address@hidden:/cvsroot/gnubg co gnubg
    cvs -z3 address@hidden:/cvsroot/gnubg co \
        -d gnubg-0.13 -r branch-0-13 gnubg

will update the trunk in ~/local/src/gnubg as before, and also update the
0.13 branch into ~/local/src/gnubg-0.13.

> When I commit patches (usually only "po/de.po" or the documentation) I
> use the command:
> "cvs commit [Path/to/file]"
> 
> 2. What have I to do now to put it into both trees?

Something along the lines of:

    cd ~/local/src/gnubg-0.13
    ### edit files now ###
    cvs commit path/to/file
    cd ~/local/src/gnubg
    cvs update -kk -j branch-0-13-merged -j branch-0-13 path/to/file
    ### resolve merge conflicts, if any ###
    cvs commit -m "Merge changes from branch-0-13." path/to/file
    cvs tag -r branch-0-13 -F branch-0-13-merged

The first cd accesses your checked-out copy of the 0.13 branch.  The
editing is self explanatory, and then the commit will check in your patches
onto the 0.13 branch.  The next cd accesses your checked out trunk, and
then the "update" will merge the changes you have just made on 0.13 into
the trunk.  They will normally merge without conflict (especially for
documentation), but if there are any conflicts you will have to finish
the merge by hand.  The next commit will check in the changes onto the
trunk, and the final "tag" command marks the point in the 0.13 branch
which is synchronised to the trunk, so that everything will work correctly
for the next developer who wants to merge changes like this.

If all of the above is too much effort, then feel free to just commit
bug fixes to 0.13 only, and forget all the update/recommit/tag stuff.
If you post a message to the list, I (or anyone else who wants to) can
merge the changes to the trunk later.

Cheers,
Gary.
-- 
   Gary Wong           address@hidden           http://www.cs.arizona.edu/~gary/