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

[Aaron Bentley]

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