Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop a duplicated assert
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 15 Jul 2021 00:27:29 +0200
changeset 47671 20f366db3e5f
parent 47670 ec1d63e64448
child 47672 0efaa1bbad2b
dirstate: drop a duplicated assert This very case is checked in 3 line above that one. Differential Revision: https://phab.mercurial-scm.org/D11126
mercurial/dirstate.py file | annotate | diff | comparison | revisions 
--- 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