[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tmda-workers
Subject:    release-1-0 branch
From:       "Jason R. Mastaler" <jason () mastaler ! com>
Date:       2003-12-19 23:27:40
[Download RAW message or body]

I've created a new branch for the 1.0.x series, which will be only
bugfixes.  The main trunk has turned into 1.1.x, which be our work in
progress, alpha-level, bleeding-edge sandbox.

Thus, a regular old 'cvs checkout tmda' will get you 1.1.x, while you
have to use the '-r release-1-0' option to get 1.0.x from CVS.

If you are a TMDA developer, it's probably easiest to just blow away
your current CVS directory and checkout fresh copies of the two
branches into different directories.  e.g,

First, the main trunk into directory 'tmda1.1':

$ cvs -z3 -d:ext:jasonrm@cvs.tmda.sourceforge.net:/cvsroot/tmda \
    co -d tmda1.1 tmda

Next, the bugfix-only branch into directory 'tmda1.0':

$ cvs -z3 -d:ext:jasonrm@cvs.tmda.sourceforge.net:/cvsroot/tmda \
    co -d tmda1.0 -r release-1-0 tmda

Season to taste.

If you aren't intimately familiar with CVS branching and merging, I'd
suggest reading that chapter from the CVS manual.  `info cvs', and 
read ``Branching and merging''.  Good stuff.

Branching and merging
*********************

   CVS allows you to isolate changes onto a separate line of
development, known as a "branch".  When you change files on a branch,
those changes do not appear on the main trunk or other branches.

   Later you can move changes from one branch to another branch (or the
main trunk) by "merging".  Merging involves first running `cvs update
-j', to merge the changes into the working directory.  You can then
commit that revision, and thus effectively copy the changes onto
another branch.

* Menu:

* Branches motivation::         What branches are good for
* Creating a branch::           Creating a branch
* Accessing branches::          Checking out and updating branches
* Branches and revisions::      Branches are reflected in revision numbers
* Magic branch numbers::        Magic branch numbers
* Merging a branch::            Merging an entire branch
* Merging more than once::      Merging from a branch several times
* Merging two revisions::       Merging differences between two revisions
* Merging adds and removals::   What if files are added or removed?
* Merging and keywords::        Avoiding conflicts due to keyword substitution
_________________________________________________
tmda-workers mailing list (tmda-workers@tmda.net)
http://tmda.net/lists/listinfo/tmda-workers
[prev in list] [next in list] [prev in thread] [next in thread]