[solved]

[Uwe Brauer]

>>> "BMJ" == Becker, Mischa J <mischa.becker at kroger.com> writes:

> -----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

Thanks, Meanwhile I found the following work around

[alias]
cpull = pull --confirm

[hooks]
pre-pull = hg status
pre-cpull = hg status

That works quite nicely.


-- 
I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel
I strongly condemn Putin's war of aggression against Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the EU and NATO membership of Ukraine. 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5684 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20241015/dd171d7e/attachment.p7s>