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

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  In D8930#134064 <https://phab.mercurial-scm.org/D8930#134064>, @marmoute wrote:
  
  > The ability to re-run the merge seems quite important and I fear the BC implication.
  
  I've never had to use that, but I can see how someone might want to run `hg co .^ -m -t :local; hg resolve -t <specific file>`, so I'm also slightly concerned about it.
  
  > What are the issue with keeping the file around? The one issue I see listed is the use of % in `hg log`
  
  I also mentioned it showing up in `hg resolve -l`. It also shows up in `hg status -v` (as a "# No unresolved merge conflicts." line being present).
  
  > could we tackle that directly instead?
  
  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?

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/20200827/02d05e88/attachment-0002.html>