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

[James Blackwell]

In lists.arch.users, you wrote:
> [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"?

If they were applied by patch, just "patch -R" the upstream changes.

PS. Harold, I know you're not the OP, but I don't seem to have the
parent threads.

-- 
James Blackwell        Using I.T. to bring more                570-407-0488
Owner, Inframix        business to your business        http://inframix.com

   GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400