[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Tagging on branches
From: |
CVS list |
Subject: |
Tagging on branches |
Date: |
Mon, 13 Nov 2006 21:08:05 +0000 |
User-agent: |
Microsoft-Entourage/11.2.5.060620 |
I'm using CVS to control website development. The trunk is used for
development. When a site is ready to go live, I want to make a branch. The
branch is used for the live site, while further development continues on the
trunk.
I'd appreciate some advice about branching and tagging. I understand the
theory of branching and merging, but I'm getting tangled up in the
specifics.
Before creating a branch, I tag the trunk (as, say,
"dev_0-1-15_branch-root"). I then plan to create the branch with
# cvs rtag -r dev_0-1-15_branch-root -b www_1-0-1_branch www.example.com.
I'm expecting to have to make minor edits to the branch and want to tag
them. Can I use www_1-0-n_branch, incrementing n as appropriate?
And then to merge the branch into the trunk in due course do I use
# cvs update -j dev_0-1-15_branch-root -j www_1-0-m_branch www.example.com
where m is the latest tag?
I'm open to any suggestions. The documentation is excellent on principles,
but some examples of real use would be a help.
Thanks
Roddie Grant
- Tagging on branches,
CVS list <=