Message-ID: <41C7C6E6.3060302@panoramicfeedback.com>
Date: Tue, 21 Dec 2004 01:47:02 -0500
From: Aaron Bentley <abentley@panoramicfeedback.com>
User-Agent: Mozilla Thunderbird 0.9 (X11/20041124)
MIME-Version: 1.0
To: Zenaan Harkness <zen@CashPoolComps.com>
Subject: Re: [Gnu-arch-users] star-merge: unable to merge unrelated trees
References: <1103504548.30881.678.camel@localhost.localdomain>	<41C650A3.4040005@panoramicfeedback.com>
	<1103606383.4576.255.camel@localhost.localdomain>
In-Reply-To: <1103606383.4576.255.camel@localhost.localdomain>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: arch <gnu-arch-users@gnu.org>
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: 1188
Lines: 37
Zenaan Harkness wrote:
> 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.

So in other words, you want to apply the difference between STABLE 1.0 
and your current devel to a new tree.

> 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?

$ tla get $archa--1.1 new
$ cd new
$ tla apply-delta $(tla logs -fr $arca--1.0 |head -n 1) $WORKINGTREE
$ tla commit -s "applied changes from $WORKINGTREE"

# $WORKINGTREE can be a revision or (less commonly) a directory.

Aaron


_______________________________________________
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/