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: <41C7C6E6.3060302@panoramicfeedback.com>
References: <1103504548.30881.678.camel@localhost.localdomain>
	<41C650A3.4040005@panoramicfeedback.com>
	<1103606383.4576.255.camel@localhost.localdomain>
	<41C7C6E6.3060302@panoramicfeedback.com>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Message-Id: <1103677738.7796.50.camel@localhost.localdomain>
Mime-Version: 1.0
Date: Wed, 22 Dec 2004 12:08:58 +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: 875
Lines: 27
> 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.

Perfect. Event against the 'less common' working tree directory.

Thanks heaps
Zen


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