On Fri, 12 Oct 2001, Greg A. Woods wrote: > [ On Friday, October 12, 2001 at 10:35:16 (+0200), Gerhard Ahuis wrote: ] > > Subject: Re: Howto solve this in cvs ? > > > > It is already done now with 2 vendor branches.. Moving the branch tag to > > the corresponding vendor version does the job.. I tested commiting of > > files on the two branches and it all seems to work fine.. > > You will encounter problems with multiple vendor branches, not the least > of which is that you no longer have correctly working conflict detection > on "cvs import". >
The conflict detection will not work on the normal branch (with the second vendor branch) but why shouldn't it work anymore on the main branch (nothing is really changed there) ? > I thought you also wanted to create normal branches from your local > "trunk" version too. That won't work (well) with even one vendor branch. If you move the branch tag by hand this will work I think, you only have to be careful when moving the branch tag from a version created on the normal branch to the second vendor branch. I didn't test what happens in that case. Cheers, Gerhard. -- Gerhard Ahuis [EMAIL PROTECTED] Unsolicited advertisements subject to $1000 consulting fee. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs