[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: undo tla star-merge ??
From: |
Matthieu Moy |
Subject: |
[Gnu-arch-users] Re: undo tla star-merge ?? |
Date: |
Fri, 22 Oct 2004 08:56:56 +0200 |
User-agent: |
Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux) |
Zenaan Harkness <address@hidden> writes:
> So, can I undo the tla star-merge, to get back to my
> "working tree + changes - star-merge stuff"?
The simplest is probably:
- Checkout a new tree
- run star-merge
- run tla-undo -o "the_merge_I_want_to_undo"
- cd the/other/working/directory
- tla apply-changeset --reverse ../path/to/the_merge_I_want_to_undo
--
Matthieu