Re: [Gnu-arch-users] Undoing a replay

[Harald Meland]

[Robert Anderson]

>>On Mon, 2003-12-15 at 16:15, Jacob Gorm Hansen wrote:
>>> hi,
>>> 
>>> I just made the big mistake of replaying some upstream changes
>>> into the wrong code checkout, which already contained some
>>> uncommited changes of my own.
>>> 
>>> Is there a clean way of 'unreplaying' these changes, leaving my
>>> original uncommitted changes intact (similar to bk unpull)?
>
> tla undo is the usual tool for undo-ing changes made by any means.

That would undo both Jacob's homemade uncommited changes and the
changes he is regretting having merged in, though, wouldn't it?  Or
have I missed some cool feature of "tla undo"?
-- 
Harald