]> git.eshelyaron.com Git - emacs.git/commit
vc-hg-mergebase: Try a pull if first attempt fails
authorSean Whitton <spwhitton@spwhitton.name>
Tue, 1 Jul 2025 14:39:39 +0000 (15:39 +0100)
committerEshel Yaron <me@eshelyaron.com>
Wed, 23 Jul 2025 20:11:59 +0000 (22:11 +0200)
commit959ac0faea3c268f3d589912b53390a225c6d116
tree9d2570fd868ac8831c4c8f6a2504bbfc1d31a2d8
parent90f4e1b5b7da01bfcd8f570c60996d03624b2db8
vc-hg-mergebase: Try a pull if first attempt fails

* lisp/vc/vc-hg.el (vc-hg-mergebase): If the first attempt
fails, execute a pull, then try again.
(vc-hg-incoming-revision): Use 'hg identify' not 'hg incoming'.

(cherry picked from commit 106048b06258e96764bcc3284893b10199b11b0b)
lisp/vc/vc-hg.el