Mercurial > hg

changeset 13880:255009c77741

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: drop unused p2 arg from rebasenode
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 16:58:24 -0500
parents 5b0a3f6cbead
children 086c9f203a53
files hgext/rebase.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Apr 04 11:41:54 2011 +0200
+++ b/hgext/rebase.py	Mon Apr 04 16:58:24 2011 -0500
@@ -171,7 +171,7 @@
                 else:
                     try:
                         ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
-                        stats = rebasenode(repo, rev, p1, p2, state)
+                        stats = rebasenode(repo, rev, p1, state)
                         if stats and stats[3] > 0:
                             raise util.Abort(_('unresolved conflicts (see hg '
                                         'resolve, then hg rebase --continue)'))
@@ -287,7 +287,7 @@
         repo.dirstate.invalidate()
         raise
 
-def rebasenode(repo, rev, p1, p2, state):
+def rebasenode(repo, rev, p1, state):
     'Rebase a single revision'
     # Merge phase
     # Update to target and merge it with local