|
| From: | Aaron Bentley |
| Subject: | Re: [Gnu-arch-users] undo tla star-merge ?? |
| Date: | Fri, 22 Oct 2004 02:19:00 -0400 |
| User-agent: | Mozilla Thunderbird 0.8 (X11/20040926) |
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 Aaron
| [Prev in Thread] | Current Thread | [Next in Thread] |