Submitter | phabricator |
---|---|
Date | July 19, 2021, 10:40 a.m. |
Message ID | <differential-rev-PHID-DREV-lit4qwxdcuqelr2yhhly-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49441/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -563,7 +563,6 @@ if merged and (clean_p1 or clean_p2): msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' raise error.ProgrammingError(msg) - assert not (merged and (clean_p1 or clean_p1)) if not (p1_tracked or p2_tracked or wc_tracked): self._drop(filename) elif merged: