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 27405 5837ca674da9
parent 27403 50b6a04f817f
child 27406 11be6b7f95da 
--- a/hgext/histedit.py	Mon Dec 14 23:14:06 2015 +0000
+++ b/hgext/histedit.py	Mon Dec 14 21:43:16 2015 +0000
@@ -409,7 +409,7 @@
         parentctx, but does not commit them."""
         repo = self.repo
         rulectx = repo[self.node]
-        hg.update(repo, self.state.parentctxnode)
+        hg.update(repo, self.state.parentctxnode, quietempty=True)
         stats = applychanges(repo.ui, repo, rulectx, {})
         if stats and stats[3] > 0:
             raise error.InterventionRequired(_('Fix up the change and run '
Mercurial