Mercurial > evolve
changeset 674:b3ce838a077e stable
evolve: remove pre 2.3 code
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 04 Feb 2013 17:21:02 +0100 |
| parents | 761b5b266985 |
| children | af9cc1e861a4 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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)')