##// END OF EJS Templates
rebase: drop unused p2 arg from rebasenode
Matt Mackall -
r13880:255009c7 default
parent child Browse files
Show More
@@ -171,7 +171,7 b' def rebase(ui, repo, **opts):'
171 else:
171 else:
172 try:
172 try:
173 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
173 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
174 stats = rebasenode(repo, rev, p1, p2, state)
174 stats = rebasenode(repo, rev, p1, state)
175 if stats and stats[3] > 0:
175 if stats and stats[3] > 0:
176 raise util.Abort(_('unresolved conflicts (see hg '
176 raise util.Abort(_('unresolved conflicts (see hg '
177 'resolve, then hg rebase --continue)'))
177 'resolve, then hg rebase --continue)'))
@@ -287,7 +287,7 b' def concludenode(repo, rev, p1, p2, comm'
287 repo.dirstate.invalidate()
287 repo.dirstate.invalidate()
288 raise
288 raise
289
289
290 def rebasenode(repo, rev, p1, p2, state):
290 def rebasenode(repo, rev, p1, state):
291 'Rebase a single revision'
291 'Rebase a single revision'
292 # Merge phase
292 # Merge phase
293 # Update to target and merge it with local
293 # Update to target and merge it with local
General Comments 0
You need to be logged in to leave comments. Login now