[Top][All Lists]

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

Re: importing vendor branches

From: Nils Jakobson
Subject: Re: importing vendor branches
Date: Thu, 3 May 2001 16:58:14 +0300

I've also encountered this problem, as far as I've verified it looks like this:
when I do unconditional checkout, it always does get the latest revision no
matter from which branch (like right after import). When I update
it updates the main trunk since it _stays_ there by default (?) but which
is not true for branching (and tagging) - it will branch the line from which it
has the latest revision! So, before branching, perform conditional checkout
where branch/tag is specified.
My solution is never work with unconditional checkouts from very
beginning, I simply put branch "1" in the checkout options and it
stays on the main line. 

I dont know how to get rid of the (by patching a client?), it
makes all the things go wrong from very beginning (if you dont know
about this feature).

Now tell me where I'm wrong, i want to understand this completely.
I have WinCVS 1.2 and RatHat box running CVS repository.

SWH Technology

----- Original Message ----- 
From: "Fergus Henderson" <address@hidden>

> On 12-Apr-2001, Larry Jones <address@hidden> wrote:
> > Fergus Henderson writes:
> > > 
> > > The reason that this broke things is that `cvs checkout'
> > > was checking out inconsistent versions of different files.
> > > After the import, some files -- those which we had not modified -- now
> > > had revision 1.1.2 on the vendor branch, and only 1.1 on the main branch,
> > > and `cvs update -A' retrieved revision 1.1.2, i.e. the vendor branch.
> > > But for other files, their version on the main branch was 1.2, and on
> > > the branch it was 1.1.2', and `cvs update -A' retrieved revision 1.2,
> > > i.e. the main branch.  So `cvs update -A' was checking out some files
> > > from the main branch (based on gc_4_1 with our modifications)
> > > and some from the vendor branch (gc_6_0_alpha6).
> > > Trying to mix incompatible versions naturally broke things.
> > > 
> > > Is this a bug in CVS?
> > 
> > More of a design limitation than a bug.
> Well, regardless of what we call it, it sucks :-(
> > Just off the top of my head, I
> > can't think of any good way to avoid this -- the merge is an integral
> > part of the import, but there isn't any way for CVS to help with the
> > merge if you don't actually do the import.
> There ought to be a way of doing an import onto a branch,
> rather than onto the main line.  Doing the import would then
> affect the branch, but would not affect the main line.
> -- 
> Fergus Henderson <address@hidden>  |  "I have always known that the pursuit
>                                     |  of excellence is a lethal habit"
> WWW: <>  |     -- the last words of T. S. Garp.
> _______________________________________________
> Info-cvs mailing list
> address@hidden

reply via email to

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