[Top][All Lists]

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

RE: change root of branch with new revision in trunk

From: Jim.Hyslop
Subject: RE: change root of branch with new revision in trunk
Date: Wed, 18 Aug 2004 17:45:25 -0400

Stins, Dick wrote:
> BlankJim,
> Sorry about the rtf/mime mails.
> I guess that this one is allright?
Yes, that's better, thanks.

> All examples I have seen are merging the trunk with the branch.
> My question is how to update the branch with the trunk.
> -  I have a file a.txt revision 1.1
> - I created a branch b which has as root a.txt revision 1.1
> - for a.txt is a revision 1.2 created (the branch has still 
> a.txt 1.1 as
> root revision)
> I would like to upgrade the branch b with a.txt revision 1.2
> Since a.txt in the branch is not changed, I would like to 
> change the root of
> branch b to a.txt revision 1.2.
> Is this possible?
Sure - it's the same command, you just have to tell CVS the start and end

cvs update -r branch_b
cvs update -j branch_b_root -j HEAD

It's a good idea to always apply two tags when branching - one for the
branch itself, and one to mark the base of the branch. In this example, the
base point is tagged as 'branch_b_root' and the branch is tagged as


Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (
Columnist, C/C++ Users Journal (

reply via email to

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