[Top][All Lists]

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

Re: changing the head to another branch

From: Jim Hyslop
Subject: Re: changing the head to another branch
Date: Mon, 10 Apr 2006 08:02:31 -0400
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Hash: SHA1

Urs Thuermann wrote:
> address@hidden (Larry Jones) writes:
>>Urs Thuermann writes:
>>>Is it possible to change which branch should be the head?
>>Only by completely redesigning and rewriting CVS and/or RCS.
> OK, looking at revision files I think at least the file format would
> support it without having to change it.
>>That's why you should keep your main development on the trunk.
> Sometimes you don't know in advance which branch will become the most
> active one after some time.  Then only merging the main development
> back onto the trunk and creating a new branch for the development
> which was on the the trunk previously seems to be the only solution.
You don't have to merge them. You can swap the head and a branch with
two simple "move branch" operations (see the FAQ entry,


cvs rtag original_head yourmodule
cvs rtag -r yourbranch -b original_branch yourmodule
cvs co yourmodule
cd yourmodule
cvs up -j HEAD -j original_branch
cvs ci -m "Moved branch development onto the trunk"
cvs up -r yourbranch
cvs up -j yourbranch -j original_head
cvs ci -m "Moved trunk development onto the branch"

- --
Jim Hyslop
Dreampossible: Better software. Simply.
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird -


reply via email to

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