Permalink
Browse files

Bug 812606 - tagging rebase step shouldn't try to fire vim to resolve…

… conflicts. r=bhearsum
  • Loading branch information...
1 parent 6f3e926 commit d64dc075dbe43153135fa40860fbec9a91e61e10 @rail rail committed Nov 19, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 lib/python/util/hg.py
@@ -466,7 +466,8 @@ def apply_and_push(localrepo, remote, changer, max_attempts=10,
# After we successfully rebase or strip away heads the push is
# is attempted again at the start of the loop
try:
- run_cmd(['hg', 'rebase'], cwd=localrepo)
+ run_cmd(['hg', '--config', 'ui.merge=internal:merge',
+ 'rebase'], cwd=localrepo)
except subprocess.CalledProcessError, e:
log.debug("Failed to rebase: %s" % str(e))
update(localrepo, branch=branch)

0 comments on commit d64dc07

Please sign in to comment.