> On 18.10.2022 16:28, Uwe Brauer wrote:

> Try this modification:

> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
> index df51f52bc7..3e78b8cfe9 100644
> --- a/lisp/vc/vc.el
> +++ b/lisp/vc/vc.el
> @@ -1715,9 +1715,6 @@ vc-default-checkin-patch
>                                               "--no-backup-if-mismatch"
>                                               "-i" "-"))
>                (user-error "Patch failed: %s" (buffer-string))))
> -          (dolist (f files)
> -            (with-current-buffer (get-file-buffer f)
> -              (revert-buffer t t t)))
>            (vc-call-backend backend 'checkin files comment))
>        (dolist (f files)
>          (copy-file (expand-file-name f tmpdir)


> This step is probably unnecessary, and might take up extra time.


I will 

> The patch you might be committing can have changes conflicting with
> the existing modifications inside the same files. We decided to allow
> that (because diff-mode definitely permits such modification).

Oh that was not clear to me.

> But 'hg update', when the file has certain changes in the same area
> that should be updated with the switch between revisions, drops you
> into merge mode.


> No, 'hg revert' is the same as 'git checkout FILE' or 'git restore
> FILE'. It affects the file contents.

> Whereas 'git reset --soft' only switches the current HEAD to a
> different revision, without touching the file contents on disk (those
> outside of .git directory, of course).

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

what's about 


hg update -C 

Or is that more like git reset --hard?

then?

Maybe some of the hg gurus that are on the CC and know git could
enlighten us?

@Arne, @Georges?



-- 
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine.