[Top][All Lists]

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

Re: how to?

From: Greg A. Woods
Subject: Re: how to?
Date: Mon, 3 Sep 2001 14:39:04 -0400 (EDT)

[ On Monday, September 3, 2001 at 11:21:59 (+0100), Ian Molton wrote: ]
> Subject: how to?
> I am trying to use it to keep the linux kernel sources in on my local
> machine.
> Im starting with kernel 2.4.3.
> I import 2.4.3
> I then branch it so I have 2.4.3-rmk1
> I then add/modify the brached files, and commit them
> I then import 2.4.4
> at this point I get conflicts, with files on the *branch*. why? and what
> do I do about it?

Don't try to use regular branches in a vendor-branched module.  It
doesn't work well, and indeed wasn't really intended to work.

There can only ever really be one successful vendor branch too, despite
what some of the documentation might lead you to believe, and especially
contrary to what the original "CVS-II" paper suggests.

If you really need to have local branches *and* a vendor branch then
you'd be much better off using "cvs add" to create and populate your
module and then to create a real branch on which you manually add the
vendor code to.  Don't use "cvs import" at all, ever, for this kind of

                                                        Greg A. Woods

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

reply via email to

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