--- a/tests/test-topic.t	Mon Mar 14 20:18:09 2016 -0400
+++ b/tests/test-topic.t	Sat Mar 12 15:36:17 2016 +0000
@@ -75,7 +75,6 @@
      narf
   $ echo >> fran work >> beta
   $ hg ci -m 'start on fran'
-  created new head
   $ hg co narf
   switching to topic narf
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -86,6 +85,7 @@
   narf
   $ echo 'narf!!!' >> alpha
   $ hg ci -m 'narf!'
+  created new head
   $ hg log -G
   @  changeset:   6:7c34953036d6
   |  tag:         tip
@@ -287,6 +287,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo answer >> alpha
   $ hg ci -m 'Narf is like `zort` or `poit`!'
+  created new head
   $ hg merge narf
   merging alpha
   warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark')
@@ -298,12 +299,16 @@
   (no more unresolved files)
   $ hg topic narf
   $ hg ci -m 'Finish narf'
+  created new head
   $ hg topics
      fran
    * narf
      query
-  $ hg debugnamecomplete
+  $ hg debugnamecomplete # branch:topic here is a buggy side effect
   default
+  default:fran
+  default:narf
+  default:query
   fran
   narf
   query
@@ -381,7 +386,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads' to see heads)
   $ hg topics
      fran
    * query
@@ -513,6 +518,7 @@
   $ hg topics --clear
   $ echo fran? >> beta
   $ hg ci -m 'fran?'
+  created new head
   $ hg log -Gr 'draft()'
   @  changeset:   10:4073470c35e1
   |  tag:         tip