[solved] (was: after pulling, shelving, stripping hg unshelve returns error)

[Becker, Mischa J]

-----Original Message-----
From: Uwe Brauer via Mercurial
Sent: Tuesday, October 15, 2024 8:56 AM

>>> "UBvM" == Uwe Brauer via Mercurial <mercurial at lists.mercurial-scm.org> writes:

>>     3. hg shelve
>>     4. Hg strip -r XXXX
>>     5. Hg unshelve
>
>> Any idea what to do?

I'm assuming you use the --update flag on pull, otherwise I can't think of a reason why your unshelve wouldn't have worked.

I know you've already fixed it, but this is what I would have done instead of shelve.

   3. hg up -r <original rev> -- merge
   4. commit changes

After that I either rebase the pulled changesets onto the new commit or I strip and re-pull them.

Mischa Becker

________________________________

This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.