Commits

Pierre-Yves David committed b3ce838

evolve: remove pre 2.3 code

  • Participants
  • Parent commits 761b5b2

Comments (0)

Files changed (1)

File hgext/evolve.py

         nodesrc = orig.node()
         destphase = repo[nodesrc].phase()
         try:
-            if rebase.rebasenode.func_code.co_argcount == 5:
-                # rebasenode collapse argument was introduced by
-                # d1afbf03e69a (2.3)
-                r = rebase.rebasenode(repo, orig.node(), dest.node(),
-                                      {node.nullrev: node.nullrev}, False)
-            else:
-                r = rebase.rebasenode(repo, orig.node(), dest.node(),
-                                     {node.nullrev: node.nullrev})
+            r = rebase.rebasenode(repo, orig.node(), dest.node(),
+                                  {node.nullrev: node.nullrev}, False)
             if r[-1]: #some conflict
                 raise util.Abort(
                         'unresolved merge conflicts (see hg help resolve)')