[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Tagging on branches
From: |
Scott Gifford |
Subject: |
Re: Tagging on branches |
Date: |
Mon, 13 Nov 2006 19:06:44 -0500 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.2 (gnu/linux) |
CVS list <address@hidden> writes:
[...]
> 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?
Yes.
> 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?
That's exactly what I do. If you later make a different change to the
branch, you have to remember to do:
cvs update -j www_1-0-m_branch -j www_1-0-n_branch www.example.com
to update from tag m to tag n. I keep a careful record of these sorts
of merges in my ChangeLog, so I can always figure out where to merge
from.
Good luck,
----Scott.