[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] star-merge: unable to merge unrelated trees

From: Zenaan Harkness
Subject: Re: [Gnu-arch-users] star-merge: unable to merge unrelated trees
Date: Wed, 22 Dec 2004 12:08:58 +1100

> 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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]