Mercurial > evolve
comparison hgext/evolve.py @ 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 |
comparison
equal
deleted
inserted
replaced
| 673:761b5b266985 | 674:b3ce838a077e |
|---|---|
| 783 destbookmarks = repo.nodebookmarks(dest.node()) | 783 destbookmarks = repo.nodebookmarks(dest.node()) |
| 784 cmdutil.duplicatecopies(repo, orig.node(), dest.node()) | 784 cmdutil.duplicatecopies(repo, orig.node(), dest.node()) |
| 785 nodesrc = orig.node() | 785 nodesrc = orig.node() |
| 786 destphase = repo[nodesrc].phase() | 786 destphase = repo[nodesrc].phase() |
| 787 try: | 787 try: |
| 788 if rebase.rebasenode.func_code.co_argcount == 5: | 788 r = rebase.rebasenode(repo, orig.node(), dest.node(), |
| 789 # rebasenode collapse argument was introduced by | 789 {node.nullrev: node.nullrev}, False) |
| 790 # d1afbf03e69a (2.3) | |
| 791 r = rebase.rebasenode(repo, orig.node(), dest.node(), | |
| 792 {node.nullrev: node.nullrev}, False) | |
| 793 else: | |
| 794 r = rebase.rebasenode(repo, orig.node(), dest.node(), | |
| 795 {node.nullrev: node.nullrev}) | |
| 796 if r[-1]: #some conflict | 790 if r[-1]: #some conflict |
| 797 raise util.Abort( | 791 raise util.Abort( |
| 798 'unresolved merge conflicts (see hg help resolve)') | 792 'unresolved merge conflicts (see hg help resolve)') |
| 799 nodenew = rebase.concludenode(repo, orig.node(), dest.node(), | 793 nodenew = rebase.concludenode(repo, orig.node(), dest.node(), |
| 800 node.nullid) | 794 node.nullid) |