Re: [patch: first impression]

[Uwe Brauer]

>>> "AB" == Arne Babenhauserheide <arne_bab@web.de> writes:

> Dmitry Gutov <dgutov@yandex.ru> writes:

>>>>>> "DG" == Dmitry Gutov <dgutov@yandex.ru> writes:
>>> On 18.10.2022 18:38, Uwe Brauer wrote:
>>>>> I am confused now! That description sounds like
>>>>> hg update
>>>>> to me
>>>>> but it seems git reset --soft would not call a merge in the case you
>>>>> describe

> The goal is to make the modified files stay exactly as they are, right?

> For that you can use the merge tool that always uses the local changes:

> hg import --bypass <patch> && hg update --merge --tool internal:merge-local
> (see hg help mergetool for details)

> ⇒ import the patch, then update and in case of conflict, use the local
>   version.

Thanks, Arne, 

Dmitry, with this approach maybe then even 
hg shelve -i
would be doable?

smime.p7s
Description: S/MIME cryptographic signature