Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/dirstate.py
changeset 47671 20f366db3e5f
parent 47670 ec1d63e64448
child 47673 37825a85d3b0 
--- a/mercurial/dirstate.py	Thu Jul 15 00:22:49 2021 +0200
+++ b/mercurial/dirstate.py	Thu Jul 15 00:27:29 2021 +0200
@@ -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:
mercurial