Re: [Gnu-arch-users] Star merging with 3 branches

[Aaron Bentley]

On Tue, 2003-12-09 at 14:58, Robert Anderson wrote:
> >
> >Here's our current tree:
> >
> >mainline
> >   |
> >   +-release
> >       |
> >       smallfeatures
> 
> You probably don't want to mirror that structure in arch.  You
> probably want to create tag revisions for your "release" branch.

Still new to the terminology.  By that, you mean project--release--1.1
and project--release--1.2 ?

> You probably want to branch smallfeatures from mainline.  Then
> you should be able to merge mainline and smallfeatures using
> star-merge.

Primarily, we want to be able to merge smallfeatures into release.  When
we do that, smallfeatures becomes a dead branch.  Later on, we merge
release into mainline.

But it would be nice to merge smallfeatures directly into mainline, so
that we can see if these changes work properly in that context also.

> You're trying to use star-merge in a non-star context.  Not too
> surprising that it doesn't work in that case.

Well, yes.  But Arch is better than CVS, so it can do every useful thing
that CVS can do, right?

Aaron

-- 
Aaron Bentley
Director of Technology
PanoMetrics, Inc.