hgext3rd/topic/__init__.py
changeset 2665 0ade6e87346b
parent 2664 ed6fb5f20b24
child 2667 e7079bba383d
--- a/hgext3rd/topic/__init__.py	Sun Jun 25 06:53:22 2017 +0530
+++ b/hgext3rd/topic/__init__.py	Sun Jun 25 07:20:22 2017 +0530
@@ -377,14 +377,11 @@
             rewrote += 1
         # move the working copy too
         wctx = repo[None]
-        # in-progress merge is a bit too complexe for now.
+        # in-progress merge is a bit too complex for now.
         if len(wctx.parents()) == 1:
             newid = successors.get(wctx.p1().node())
             if newid is not None:
-                # this provide some useless output we shoudl eventually suppress
-                #
-                # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-                hg.update(repo, newid)
+                hg.update(repo, newid, quietempty=True)
         txn.close()
     finally:
         lock.release(txn, l, wl)