[Commented On] D8930: mergestate: clear merge state if there are no unresolved conflicts

[marmoute (Pierre-Yves David)]

marmoute added a comment.


  In D8930#134205 <https://phab.mercurial-scm.org/D8930#134205>, @martinvonz wrote:
  
  > In D8930#134064 <https://phab.mercurial-scm.org/D8930#134064>, @marmoute wrote:
  >
  >> 
  >
  > Do you mean that we could make `hg log -G` not show `%` if all conflicts are resolved? Maybe we'd do the same for `hg status -v` in that case? But probably leave `hg resolve -l` alone?
  
  Yeah, something like that. That is is not great, but still seems better than blindly dropping the mergestate.
  
  Maybe we could have `hg continue` play a role here ? leaving `hg resolve` and `hg status -v` as they are now and pointing at `hg continue` to drop the merge state. (maybe still fix the log output in all case?)

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200828/630fe1a9/attachment-0002.html>