Submitter | phabricator |
---|---|
Date | Feb. 14, 2020, 6:20 a.m. |
Message ID | <differential-rev-PHID-DREV-ahmpo4tkoihf5q6a3hcr-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/45228/ |
State | Superseded |
Headers | show |
Comments
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: mjpieters, mercurial-devel
martinvonz added a comment.
In D8118#121598 <https://phab.mercurial-scm.org/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/
REVISION DETAIL
https://phab.mercurial-scm.org/D8118
To: martinvonz, #hg-reviewers, pulkit
Cc: mjpieters, mercurial-devel
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -413,14 +413,7 @@ Returns True if there appears to be mergestate. This is a rough proxy for "is a merge in progress." """ - # Check local variables before looking at filesystem for performance - # reasons. - return ( - bool(self._local) - or bool(self._state) - or self._repo.vfs.exists(self.statepathv1) - or self._repo.vfs.exists(self.statepathv2) - ) + return bool(self._local) or bool(self._state) def commit(self): """Write current state on disk (if necessary)"""