D8289: resolve: add a --clear option for clearing the merge state

marmoute (Pierre-Yves David) phabricator at mercurial-scm.org
Thu Mar 19 23:43:10 UTC 2020


marmoute added a comment.


  In D8289#124009 <https://phab.mercurial-scm.org/D8289#124009>, @pulkit wrote:
  
  > I like the idea. IIRC, Ryan from FB hit similar issues in a sprint some years ago and came up with `hg up --finish` or something like that.
  > Maybe we should not let user clear the mergestate and suggest `continue/<cmd-name> --continue` if it's not result of update command. Thoughts?
  
  Ho, that's a good idea. It looks like `hg update --merge` is the only command that do not have `--continue` support. So instead of adding a whole new flag and action to this exception, removing the exception seems like a better move. What do you think @martinvonz ?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8289/new/

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

To: martinvonz, #hg-reviewers
Cc: marmoute, pulkit, mercurial-devel


More information about the Mercurial-devel mailing list