D5218: resolve: when resolve.mark-check=abort, downgrade to warning if pats specified

Yuya Nishihara yuya at tcha.org
Sat Nov 3 22:10:15 EDT 2018


Queued for stable, thanks.

>   Previously, with --config resolve.mark-check=abort, running `hg resolve -m foo`
>   would abort and emit a message saying to use --all.  This command does not work,
>   though: `hg resolve -m foo --all`, and it's really weird for --all to be the
>   "--force" flag.
>   
>   My original goal with the option was to make it so that `hg resolve -m` (no
>   filename arguments) was safer, which is why --all is used; in my mind, `hg
>   resolve -m foo` should always mark it as resolved, and `--all` is how you
>   specify "all the files", so that's why I chose `hg resolve -m --all` as the way
>   out of `hg resolve -m` aborting. This commit makes all of this work the way it
>   was meant to in my head :)

I thought it should abort if pats matched bad files, but realized it wouldn't
make sense since there's no "force" flag other than `--all`.

Can you update the config help to reflect this change?


More information about the Mercurial-devel mailing list