Mercurial > hg

diff hgext/rebase.py @ 38508:39db5a01cd53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: pass in overwrite flag to hg.updaterepo() as named argument For clarity.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 01 Jul 2018 21:40:55 +0900
parents 53800d6eed26
children 19076e2d62e7
line wrap: on
line diff
--- a/hgext/rebase.py	Sat Jun 30 07:23:02 2018 +0530
+++ b/hgext/rebase.py	Sun Jul 01 21:40:55 2018 +0900
@@ -623,7 +623,7 @@
             newwd = self.originalwd
         if newwd not in [c.rev() for c in repo[None].parents()]:
             ui.note(_("update back to initial working directory parent\n"))
-            hg.updaterepo(repo, newwd, False)
+            hg.updaterepo(repo, newwd, overwrite=False)
 
         collapsedas = None
         if self.collapsef and not self.keepf: