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

[Diego Novillo <dnovillo at redhat dot com>]

On Thu, 2004-05-13 at 15:35, 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
> 
that will bring the changes between tree-ssa-at-last-merge and
current-mainline, is that what you want?  I would've thought you wanted
changes from last lno merge to current-mainline.  As an example, this is
what I did yesterday to merge tree-ssa:

$ cvs co gcc
$ cvs tag tree-ssa-pre-merge
$ cvs up -j tree-ssa-pre-merge -j tree-ssa-20020619-branch
$ cvs ci
$ cvs tag tree-ssa-post-merge

The actual merge is the third line: merge all patches between mainline
pre-merge and tip-of-branch.  If you want to base off of mainline now,
you should not need to change your merge significantly.  I'd say:

$ cvs up -j last-lno-merge-tag -j tree-ssa-post-merge


Diego.