Re: Tagging on branches

[CVS list]

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


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

Thanks

Roddie Grant