Re: Again: multiple vendors

2005-03-20 Thread Baurzhan Ismagulov
Hello, I've tried both and found that normal (as opposed to vendor) branches were easier to understand and not that difficult to implement ($Log$ turned out to be solvable just like other keywords), so that is what I did. Thanks much for all replies! With kind regards, Baurzhan. On Sun, Mar

Re: Again: multiple vendors

2005-03-07 Thread Kaz Kylheku
On Sun, 6 Mar 2005, Baurzhan Ismagulov wrote: Thanks to all for comments and suggestions! The CVS vendor branch feature has a broken design. At best, it can be used to track new versions of the original baseline that was used to create the repository with ``cvs import''. Even for that, it is

Re: Again: multiple vendors

2005-03-06 Thread Baurzhan Ismagulov
Thanks to all for comments and suggestions! On Thu, Mar 03, 2005 at 05:50:02PM -0500, Greg A. Woods wrote: Do not use cvs import. It can not work as any part of what you want to do. Hmm, Cederqvist recommends it in https://www.cvshome.org/docs/manual/cvs-1.12.11/cvs_13.html#SEC108

Re: Again: multiple vendors

2005-03-06 Thread Baurzhan Ismagulov
On Fri, Mar 04, 2005 at 02:42:56AM +, Pierre Asselin wrote: Greg A. Woods [EMAIL PROTECTED] wrote: Multiple vendor branches CANNOT work for what you want. Period. Maybe with the new import -X in cvs 1.12.x ? This was touched upon briefly in another thread. Thanks for the link, I'll

Re: Again: multiple vendors

2005-03-06 Thread Baurzhan Ismagulov
On Fri, Mar 04, 2005 at 11:38:09AM -0500, Larry Jones wrote: Baurzhan Ismagulov writes: 1. Added and deleted files: I have to track them manually when I apply the delta for a new upstream release. I have to grep for 1970 and add / remove the files. That shouldn't be necessary --

Re: Again: multiple vendors

2005-03-06 Thread Pierre Asselin
Baurzhan Ismagulov [EMAIL PROTECTED] wrote: On Fri, Mar 04, 2005 at 02:42:56AM +, Pierre Asselin wrote: The multiple vendor branch was not funny, so I agree with Greg. I had to manually reset many admin -b values, move files in and out of the Attic (I think), etc. When I got to the

RE: Again: multiple vendors

2005-03-04 Thread Andy Cheong Kok Mung
Tnks :) -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Fabian Cenedese Sent: Friday, March 04, 2005 3:09 PM To: info-cvs@gnu.org Subject: RE: Again: multiple vendors Hi, can advice how to unsubscribe form the mailing list? List-Id: Announcements

Re: Again: multiple vendors

2005-03-04 Thread Larry Jones
Baurzhan Ismagulov writes: 1. Added and deleted files: I have to track them manually when I apply the delta for a new upstream release. I have to grep for 1970 and add / remove the files. That shouldn't be necessary -- a normal merge using two revision tags should note and process

Re: Again: multiple vendors

2005-03-03 Thread Greg A. Woods
[ On Wednesday, March 2, 2005 at 22:19:22 (+0100), Baurzhan Ismagulov wrote: ] Subject: Again: multiple vendors (was: Re: Long version numbers | Tedious to keep track) I've got 4 upstream vendors and want to keep them in different branches. I have two goals: importing new upstream versions

Re: Again: multiple vendors

2005-03-03 Thread Baurzhan Ismagulov
Hello Greg, thanks for your answer! On Thu, Mar 03, 2005 at 03:58:42AM -0500, Greg A. Woods wrote: I've got 4 upstream vendors and want to keep them in different branches. I have two goals: importing new upstream versions and merging the deltas into the main trunk, and tracking which

Re: Again: multiple vendors

2005-03-03 Thread Greg A. Woods
[ On Thursday, March 3, 2005 at 21:31:58 (+0100), Baurzhan Ismagulov wrote: ] Subject: Re: Again: multiple vendors On Thu, Mar 03, 2005 at 03:58:42AM -0500, Greg A. Woods wrote: Do not use cvs import. It can not work as any part of what you want to do. Hmm, Cederqvist recommends

Re: Again: multiple vendors

2005-03-03 Thread Pierre Asselin
Greg A. Woods [EMAIL PROTECTED] wrote: Multiple vendor branches CANNOT work for what you want. Period. Maybe with the new import -X in cvs 1.12.x ? This was touched upon briefly in another thread. https://www.cvshome.org/docs/manual/cvs-1.12.11/cvs_16.html#SEC154 I once did a two-vendor

Re: Again: multiple vendors

2005-03-03 Thread Pierre Asselin
Baurzhan Ismagulov [EMAIL PROTECTED] wrote: Could a Branching Expert please help me drawing the same for my needs? I've got 4 upstream vendors and want to keep them in different branches. I have two goals: importing new upstream versions and merging the deltas into the main trunk, and

RE: Again: multiple vendors

2005-03-03 Thread Andy Cheong Kok Mung
Hi, can advice how to unsubscribe form the mailing list? thanks -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Pierre Asselin Sent: Friday, March 04, 2005 11:13 AM To: info-cvs@gnu.org Subject: Re: Again: multiple vendors Baurzhan Ismagulov [EMAIL

RE: Again: multiple vendors

2005-03-03 Thread Fabian Cenedese
Hi, can advice how to unsubscribe form the mailing list? List-Id: Announcements and discussions for the CVS version control system info-cvs.gnu.org List-Unsubscribe: http://lists.gnu.org/mailman/listinfo/info-cvs, mailto:[EMAIL PROTECTED] List-Archive:

Again: multiple vendors (was: Re: Long version numbers | Tedious to keep track)

2005-03-02 Thread Baurzhan Ismagulov
Hi, I see an interesting discussion about branching. I've posted a similar question (http://lists.gnu.org/archive/html/info-cvs/2005-02/msg00284.html) a couple of weeks ago, but received no answer. I skimmed through the mentioned branching guide; it's very useful, but I'm not sure how to apply