Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/histedit.py
changeset 27407 bf4d5d8dc2aa
parent 27406 11be6b7f95da
child 27414 6602a7b9deec 
--- a/hgext/histedit.py	Mon Dec 14 22:37:31 2015 +0000
+++ b/hgext/histedit.py	Mon Dec 14 23:04:17 2015 +0000
@@ -602,7 +602,7 @@
     def run(self):
         repo = self.repo
         rulectx = repo[self.node]
-        hg.update(repo, self.state.parentctxnode)
+        hg.update(repo, self.state.parentctxnode, quietempty=True)
         applychanges(repo.ui, repo, rulectx, {})
         raise error.InterventionRequired(
             _('Make changes as needed, you may commit or record as needed '
Mercurial