Re: [Gnu-arch-users] undo tla star-merge ??

[Zenaan Harkness]

On Fri, 2004-10-22 at 16:19, Aaron Bentley wrote:
> Zenaan Harkness wrote:
> > So, can I undo the tla star-merge, to get back to my
> > "working tree + changes - star-merge stuff"?
> 
> Yes.  there's a recipe in the wiki:
> http://wiki.gnuarch.org/moin.cgi/Arch_20Recipes#head-24d1cf532a51f21199f488bf17ee384e54061e4a
> 
> Or you can use the technique of aba/fai star-merge-undo:
> tla undo
> tla star-merge --changes $tmp/merge-undo
> tla redo
> tla apply-changeset --reverse $tmp/merge-undo $(tla tree-root)
> rm -Rf $tmp

Thanks heaps for all the suggestions,
Zen