D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Wed Aug 1 17:55:09 EDT 2018


pulkit added a comment.


  In https://phab.mercurial-scm.org/D4035#62582, @spectral wrote:
  
  > In https://phab.mercurial-scm.org/D4035#62542, @pulkit wrote:
  >
  > > I like the idea here. @khanchi97 is already working on adding --confirm to `hg resolve`, how about having something like `hg resolve --mark --confirm` which asks you before marking each file as resolved?
  >
  >
  > My primary goal is that `hg resolve --mark` be made safer.  The exact mechanism isn't too important to me :)  If this involves a --confirm mode that can be defaulted to on, preferably with an auto-confirm-if-no-markers-detected, that's fine with me.  If it requires explicit opt-in on the commandline (instead of being something that can be turned on with a config), I don't think that it would accomplish the same safety improvement.
  
  
  Yep, I agree with you. Queued this patch, many thanks! Can you add about this on https://www.mercurial-scm.org/wiki/Release4.8? We have a section for experimental features.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4035

To: spectral, #hg-reviewers
Cc: pulkit, khanchi97, mercurial-devel


More information about the Mercurial-devel mailing list