[Top][All Lists]

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

Re: strange merge issue between two local branches

From: Greg A. Woods
Subject: Re: strange merge issue between two local branches
Date: Tue, 22 Apr 2003 15:52:16 -0400 (EDT)

[ On Tuesday, April 22, 2003 at 13:58:38 (-0500), Tim Mooney wrote: ]
> Subject: strange merge issue between two local branches
> I then created a couple of branches from there, and committed two
> different versions of our local patches to those two different branches:

You cannot reliably use normal CVS branches in a vendor-branched module
(i.e. one created with "cvs import" and where "cvs import" is used to
add new vendor releases).  The two simply do not mix (and conceptually
cannot mix either since the vendor branch trick is completely at odds
with normal CVS branches).

Vendor branched modules can have two, and only two, branches:  The
trunk, where local changes are made, and the vendor branch (1.1.1) where
vendor revisions are imported.  Merges are done to the trunk.

I would recommend to you that you start over, and instead of using "cvs
import" you'll need to manually put the vendor releases on some branch
(either the trunk or some manually created "normal" CVS branch
designated to the vendor, the choice depends on a great many factors).

You will then have to manually commit every new vendor release to its
branch and then merge every nre vendor release to every local branch
that you want to "bring current" with the new vendor release.

                                                                Greg A. Woods

+1 416 218-0098;            <address@hidden>;           <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>

reply via email to

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