[PATCH STABLE] histedit: make check for unresolved conflicts explicit (issue5545)

Yuya Nishihara yuya at tcha.org
Fri Apr 21 09:01:49 EDT 2017


On Thu, 20 Apr 2017 17:19:05 -0700, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1492733888 25200
> #      Thu Apr 20 17:18:08 2017 -0700
> # Node ID f368dbe9671ece414c842f164269e893521e3e5d
> # Parent  ed42e00a5c4ec7a3bebaec699ef934429cdc2ddd
> histedit: make check for unresolved conflicts explicit (issue5545)
> 
> Previously, we'd rely on the implicit check that `localrepo.commit` did.
> The problem is that that check only happened when the working copy was
> dirty. With a "clean" working copy but unresolved conflicts we'd get
> into a broken state.
> 
> To fix that, do what rebase does and check for unresolved conflicts at
> the start of histedit --continue.

Looks good. Queued, thanks.


More information about the Mercurial-devel mailing list