[Top][All Lists]

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

Re: Multiple vendor branches?

From: Greg A. Woods
Subject: Re: Multiple vendor branches?
Date: Tue, 8 May 2001 17:33:06 -0400 (EDT)

[ On Tuesday, May 8, 2001 at 17:07:10 (-0400), Daniel Horner wrote: ]
> Subject: Multiple vendor branches?
> I've got two external branches of the same code from different vendors, call
> them A and B. I've imported them as described in TFM under "Multiple Vendor
> Branches".  Development has actively continued on the source from A

Multiple vendor branch support in CVS is not really implemented and
definitely does not work in any way you might expect it to.

You'll have to use two real branches (unpack into a working directory
checked out on the brand and commit all changes manually) and then do
whatever merges to your development branch (perhaps the trunk, or
whatever) you wish to do from any of the third-party branches.

[[ BTW, don't ever send HTML mail to people who don't explicitly request
it, and especially not ever to a public mailing list!!!! ]]

                                                        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]