Re: Branching in a vendor branch

2004-08-18 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Jay, I believe you want to use cvs 1.12.9.1 as taken from the feature branch of the cvs.cvshome.org repository. It has a new feature for import which is the -X switch to make sure that vendor imports do not show up on the main trunk. See the

Re: Branching in a vendor branch

2004-08-17 Thread [EMAIL PROTECTED]
On Mon, 16 Aug 2004, Doug Lee wrote: What has happened that is different that I don't understand how to handle is the following. The open source project had to create a security patch to the last production release. A branch was created off the last release tag, and the changes for the

Re: Branching in a vendor branch

2004-08-17 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] [EMAIL PROTECTED] writes: It is too bad you cannot specify an import with -b using a symbolic branch tag. Semantically that seems consistent with the intent of -b1.1.3, for example. Huh? You CAN specify the '-b 1.1.3' value if

Branching in a vendor branch

2004-08-16 Thread [EMAIL PROTECTED]
I have a project in CVS which is a feature enhancement patch to an open source project. My feature enhanced code is checked into the trunk. Each major release of the open source project is checked into the CVS vendor branch. I have been developing successfully in this manner for quite some

Re: Branching in a vendor branch

2004-08-16 Thread Doug Lee
On Mon, Aug 16, 2004 at 06:22:33PM -0700, [EMAIL PROTECTED] wrote: I have a project in CVS which is a feature enhancement patch to an open source project. My feature enhanced code is checked into the trunk. Each major release of the open source project is checked into the CVS vendor branch.