Submitter | phabricator |
---|---|
Date | March 28, 2021, 11:32 p.m. |
Message ID | <differential-rev-PHID-DREV-gquxtpfceekj24pducwb-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/48602/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py --- a/mercurial/mergestate.py +++ b/mercurial/mergestate.py @@ -11,6 +11,7 @@ hex, nullhex, nullid, + nullrev, ) from . import ( error, @@ -341,7 +342,7 @@ flo = fco.flags() fla = fca.flags() if b'x' in flags + flo + fla and b'l' not in flags + flo + fla: - if fca.node() == nullid and flags != flo: + if fca.rev() == nullrev and flags != flo: if preresolve: self._repo.ui.warn( _(