[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Tagging on branches

From: CVS list
Subject: Re: Tagging on branches
Date: Tue, 14 Nov 2006 10:06:19 +0000
User-agent: Microsoft-Entourage/

On 14/11/06 00:06, "Scott Gifford" <address@hidden> wrote:

> 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
>> 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
>> 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
> 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.

Thanks Scott. It's good to get reassurance. Would you be willing to share
something of the changelog - not the content, but how it "works" (or can
anyone point me to a resource on changelog good practice).


Roddie Grant

reply via email to

[Prev in Thread] Current Thread [Next in Thread]