##// END OF EJS Templates
rebase: pass wctx to rebasenode()...
Phil Cohen -
r35317:259feddc default
parent child Browse files
Show More
@@ -481,7 +481,7 b' class rebaseruntime(object):'
481 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
481 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
482 'rebase')
482 'rebase')
483 stats = rebasenode(repo, rev, p1, base, self.state,
483 stats = rebasenode(repo, rev, p1, base, self.state,
484 self.collapsef, dest)
484 self.collapsef, dest, wctx=self.wctx)
485 if stats and stats[3] > 0:
485 if stats and stats[3] > 0:
486 if self.wctx.isinmemory():
486 if self.wctx.isinmemory():
487 raise error.InMemoryMergeConflictsError()
487 raise error.InMemoryMergeConflictsError()
@@ -992,7 +992,7 b' def concludenode(repo, rev, p1, p2, comm'
992 repo.dirstate.setbranch(repo[newnode].branch())
992 repo.dirstate.setbranch(repo[newnode].branch())
993 return newnode
993 return newnode
994
994
995 def rebasenode(repo, rev, p1, base, state, collapse, dest):
995 def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx):
996 'Rebase a single revision rev on top of p1 using base as merge ancestor'
996 'Rebase a single revision rev on top of p1 using base as merge ancestor'
997 # Merge phase
997 # Merge phase
998 # Update to destination and merge it with local
998 # Update to destination and merge it with local
General Comments 0
You need to be logged in to leave comments. Login now