Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove pre 2.3 code stable
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Mon, 04 Feb 2013 17:21:02 +0100
branchstable
changeset 674 b3ce838a077e
parent 673 761b5b266985
child 675 af9cc1e861a4
evolve: remove pre 2.3 code
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Mon Feb 04 17:18:02 2013 +0100
+++ b/hgext/evolve.py	Mon Feb 04 17:21:02 2013 +0100
@@ -785,14 +785,8 @@
         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)')
evolve