[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: vendor branching and merge
From: |
Greg A. Woods |
Subject: |
Re: vendor branching and merge |
Date: |
Mon, 25 Feb 2002 21:06:36 -0500 (EST) |
[ On Monday, February 25, 2002 at 12:01:26 (-0500), Eric Siegerman wrote: ]
> Subject: Re: vendor branching and merge
>
> On Sat, Feb 23, 2002 at 03:56:22PM -0500, Larry Jones wrote:
> > Greg A. Woods writes:
> > > Working on a checked out vendor branch is not always going to have the
> > > correct results with CVS -- the vendor branch is too magic.
> >
> > Please elucidate -- I don't know of any way that import treats the
> > vendor branch in a particularly magic fashion.
>
> If you "add+commit" a new file to the vendor branch, cvs doesn't
> set the RCS default branch to 1.1.1, as creating the file via
> "import" would do.
Ah, yes, that's definitely one of the issues.....
> NOT a bug, IMO; but it is a difference that
> should be borne in mind.
Hmmmm.... it might be a bug -- it depends I guess on what it means to
"work" on the vendor branch. In some respects such "work" is no
different than importing a new release where the changes were made
elsewhere, so in that case a new file should have the default branch set
on first commit, just as if it were imported....
> Not sure whether there's anything else.
I believe there is, but I still can't remember off the top of my head.....
--
Greg A. Woods
+1 416 218-0098; <address@hidden>; <address@hidden>; <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>
- vendor branching and merge, heatherw, 2002/02/22
- Re: vendor branching and merge, Eric Siegerman, 2002/02/22
- Re: vendor branching and merge, Paul Sander, 2002/02/22
- Re: vendor branching and merge, Larry Jones, 2002/02/22
- Re: vendor branching and merge, Greg A. Woods, 2002/02/22
- Re: vendor branching and merge, Larry Jones, 2002/02/23
- Re: vendor branching and merge, Greg A. Woods, 2002/02/24
- Re: vendor branching and merge, Eric Siegerman, 2002/02/25
- Re: vendor branching and merge,
Greg A. Woods <=
- Re: vendor branching and merge, Eric Siegerman, 2002/02/26
- Re: vendor branching and merge, Larry Jones, 2002/02/26