D6957: rebase: unconditionally clear merge state when `--stop`ing a rebase

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Fri Oct 4 09:32:03 EDT 2019

durin42 added a comment.

  In D6957#101985 <https://phab.mercurial-scm.org/D6957#101985>, @martinvonz wrote:
  > In D6957#101984 <https://phab.mercurial-scm.org/D6957#101984>, @marmoute wrote:
  >> In D6957#101977 <https://phab.mercurial-scm.org/D6957#101977>, @martinvonz wrote:
  >>> How was it failing for you?
  >>> I don't think I've used `hg rebase --stop`, but I had been wondering what it would do with the working directory. It's unclear to me what it should do, and now after looking at the code, it's also unclear what the author meant it to do. Maybe it would be best to just leave the working directory untouched? Oh, we should also compare to what `hg evolve --stop` does (I haven't checked).
  >> The evolve semantic, is to:
  >> - get out of the current conflict (so, reverting the working copy)
  >> - preserve all successful evolution so far.
  >> Since you cannot `continue` after the --stop, we would not be able to do anything good with the conflict if the user resolved it anyway.
  >> I think rebase should have the same logic and revert the current conflict (preserving all successfully rebased revision)
  > True, you'd get to resolve the conflicts on the next `hg rebase/evolve` anyway, so I agree there's no need to preserve the working copy.
  > @durin42, any idea how you ended up with just one working copy parent?
  I don't have just one parent. If you want to inspect the state, look at `augie/a 59473`;)

  rHG Mercurial



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

More information about the Mercurial-devel mailing list