A.9.2.2 Creating the branch after editing
Say you have been working on some extremely
experimental software, based on whatever revision you
happened to checkout last week. If others in your
group would like to work on this software with you, but
without disturbing main-line development, you could
commit your change to a new branch. Others can then
checkout your experimental stuff and utilize the full
benefit of CVS conflict resolution. The scenario might
look like:
| [[ hacked sources are present ]]
$ cvs tag -b EXPR1
$ cvs update -r EXPR1
$ cvs commit
|
The update
command will make the `-r
EXPR1' option sticky on all files. Note that your
changes to the files will never be removed by the
update
command. The commit
will
automatically commit to the correct branch, because the
`-r' is sticky. You could also do like this:
| [[ hacked sources are present ]]
$ cvs tag -b EXPR1
$ cvs commit -r EXPR1
|
but then, only those files that were changed by you
will have the `-r EXPR1' sticky flag. If you hack
away, and commit without specifying the `-r EXPR1'
flag, some files may accidentally end up on the main
trunk.
To work with you on the experimental change, others
would simply do
| $ cvs checkout -r EXPR1 whatever_module
|