[Top][All Lists]

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

Re: complicated merge question

From: Pierre Asselin
Subject: Re: complicated merge question
Date: Wed, 19 Sep 2007 01:23:23 +0000 (UTC)
User-agent: tin/1.8.3-20070201 ("Scotasay") (UNIX) (NetBSD/3.1_RC3 (i386))

Ted Stern <address@hidden> wrote:

> Say I have created a branch:

>     cvs -d /cvs/root/dir checkout project
>     cd project
>     cvs tag BRANCH_ROOT
>     cvs tag -b branch
>     cvs update -r branch

> and over time the trunk has been updated with some important changes
> that might possibly conflict and need to be tested, so I need to merge
> in work from the trunk to the branch.

That always makes me nervous, because of the difficulty of later
merging the branch back to the trunk.  Can you achieve what you want
by re-grafting the branch ?   From the trunk,

    cvs tag BRANCH2_ROOT
    cvs tag -b branch2
    cvs update -r branch2
    cvs update -j BRANCH_ROOT -j branch
    (fix conflicts...)
    cvs commit

and you abandon the original branch.

(This isn't what you asked, but you said separately that you
solved your original problem.)

pa at panix dot com

reply via email to

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