Subject: Re: [Gnu-arch-users] star-merge: unable to merge unrelated trees
From: Zenaan Harkness <zen@CashPoolComps.com>
To: arch <gnu-arch-users@gnu.org>
In-Reply-To: <41C650A3.4040005@panoramicfeedback.com>
References: <1103504548.30881.678.camel@localhost.localdomain>
	<41C650A3.4040005@panoramicfeedback.com>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Message-Id: <1103606383.4576.255.camel@localhost.localdomain>
Mime-Version: 1.0
Date: Tue, 21 Dec 2004 16:19:43 +1100
Precedence: list
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 1990
Lines: 66
On Mon, 2004-12-20 at 15:10, Aaron Bentley wrote:
> Zenaan Harkness wrote:
>
> > if I do the following as user zen, I get an error:
> > 
> > $ tla get $parthat t
> > ...
> > $ cd t
> > 
> > $ tla star-merge --three-way $dmitriat
> 
> It looks like $parthat has no patchlogs for $dmitriat.  You would expect 
> this to happen at first.
> 
> You could probably make this work by using "tla star-merge --reference 
> $archat --three-way $dmitriat"
> 
> > However, if I do the following, it works just fine:
> > 
> > $ tla get $archat t
> > ...
> > $ cd t
> > 
> > $ tla star-merge --three-way $parthat
> > ...
> > 
> > $ tla star-merge --three-way $dmitriat
> 
> I assume these work because $parthat and $dmitriat have patchlogs for 
> $archat.

Thanks. Now for step 2:

Because of the above, we have some funky 3D changes in this working tree
thusly created.

Now, STABLE 1.0 needs to stay stable 1.0 until at least Thursday, and
possibly over the christmas break, in case I need to apply some quick
fix or two during that time.

I want to take the thusly created working tree above, and turn that into
STABLE 1.1.

If I "tla tag $archa--1.0 $archa--1.1" to create a 1.1 version, how do I
apply the working tree above (with the funky changes) to the 1.1 tree,
to create the desired 1.1 (development, but next stable) tree?

In my mind at least, it's a reparenting technicality (since the working
tree is currently a child of 1.0).

One way to do it would be to tag 1.1, and call that the "old" version,
with 1.0 continuing on as the "trunk" or new development (soon to be
stable) version. Perhaps that makes most sense? 1.0 being the eternal
trunk, off of which various stable releases are tagged as needed ??

Needing that definitive guide to branching and merging,
Zenaan


_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/