D8118: mergestate: determine if active without looking for state files on disk

Closed by commit rHG5e3402a0b868: mergestate: determine if active without looking for state files on disk (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D811

D8118: mergestate: determine if active without looking for state files on disk

martinvonz added a comment. In D8118#121598 , @pulkit wrote: > This series fails to apply on current default tip. Fixed REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8118/new/ RE

D8118: mergestate: determine if active without looking for state files on disk

martinvonz updated this revision to Diff 20360. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8118?vs=20212&id=20360 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8118/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8118: mergestate: determine if active without looking for state files on disk

pulkit added a comment. This series fails to apply on current default tip. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8118/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8118 To: martinvonz, #hg-reviewers, pulkit Cc: mjpi

D8118: mergestate: determine if active without looking for state files on disk

martinvonz created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I couldn't think of a reason that we need to check state files on disk to determine if a merge is active. I could imagine them being for there for d