bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved


From: Tom Tromey
Subject: bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved
Date: Mon, 11 Sep 2017 15:11:32 -0600
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)

>>>>> "Dmitry" == Dmitry Gutov <address@hidden> writes:

Dmitry> Thanks for the report. I don't have time now to repro, but please try
Dmitry> the following patch. Maybe add a third t to the arguments list if it
Dmitry> doesn't help.

Dmitry> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
Dmitry> index cc3e295..6123b32 100644
Dmitry> --- a/lisp/vc/vc-git.el
Dmitry> +++ b/lisp/vc/vc-git.el
Dmitry> @@ -964,6 +964,7 @@ vc-git-resolve-when-done
Dmitry>                                                  (vc-git-root
Dmitry> buffer-file-name)))
Dmitry>                 (vc-git-conflicted-files (vc-git-root 
buffer-file-name)))
Dmitry>          (vc-git-command nil 0 nil "reset"))
Dmitry> +      (vc-resynch-buffer buffer-file-name t t)
Dmitry>        ;; Remove the hook so that it is not called multiple times.
Dmitry>        (remove-hook 'after-save-hook 'vc-git-resolve-when-done t))))

I finally got around to trying this last night, and it worked for me.
Could you check it in?

thanks,
Tom





reply via email to

[Prev in Thread] Current Thread [Next in Thread]