Re: [lno] what's going to happen with the branch?

[Daniel Jacobowitz <drow at false dot org>]

On Thu, May 13, 2004 at 09:35:47PM +0200, Zdenek Dvorak wrote:
> Hello,
> 
> > > > What's going to happen with the tree-ssa-20020619-branch based branches
> > > > now that the tree-ssa branch is closed?  I know only of lno and
> > > > tree-profiling, but maybe there are others.  I first thought they would
> > > > perhaps be merged into tree-ssa-20020619-branch and development continues
> > > > there.
> > > 
> > > I think the idea about lno-branch is to merge at least the more stable
> > > parts to mainline soon; for the rest, I think the branch should continue
> > > to exist, based on mainline (is there some easy way how to do it,
> > > or do I have to just create a new branch and commit the changes to it?)
> > 
> > You can just do a merge, except instead of merging from tree-ssa you
> > merge from mainline.  Then, the branch will be "based on" mainline.
> > 
> > CVS doesn't keep track of what a branch is based on, you have to do
> > that yourself.
> 
> so
> 
> cvs -z9 up -j tree-ssa-at-last-merge -j current-mainline
> 
> will work? I somewhat doubt this (there seems to be no link between
> the versions of the files at tree-ssa branch and those in mainline,
> as far as I understand CVS).

There doesn't need to be - it will just look at the changes between the
versions refered to be each -j as a diff.

-- 
Daniel Jacobowitz