tests/test-topic-flow-reject-untopiced.t
changeset 3280 e642bad8174a
parent 3235 8a772f0c54d9
child 4840 62b60fc1983d
--- a/tests/test-topic-flow-reject-untopiced.t	Tue Dec 12 01:10:44 2017 +0100
+++ b/tests/test-topic-flow-reject-untopiced.t	Tue Dec 12 00:16:55 2017 +0100
@@ -17,6 +17,7 @@
   $ hg topic server
   marked working directory as topic: server
   $ for ch in a b c; do echo foo > $ch; hg ci -Aqm "Added "$ch; done
+  $ hg ph -p 0
 
   $ hg log -G -T "{rev}:{node|short}\n{desc}  {topics}"
   @  2:a7b96f87a214
@@ -24,7 +25,7 @@
   o  1:d6a8197e192a
   |  Added b  server
   o  0:49a3f206c9ae
-     Added a  server
+     Added a
 
   $ cd ..
 
@@ -32,19 +33,21 @@
 
   $ hg clone server client
   updating to branch default
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg up server
   switching to topic server
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd client
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G -T "{rev}:{node|short}\n{desc}  {topics}"
   @  2:a7b96f87a214
   |  Added c  server
   o  1:d6a8197e192a
   |  Added b  server
   o  0:49a3f206c9ae
-     Added a  server
+     Added a
 
   $ hg topic
-   * server (3 changesets)
+   * server (2 changesets)
 
 Create a changeset without topic
 
@@ -60,7 +63,7 @@
   o  1:d6a8197e192a
   |  Added b  server
   o  0:49a3f206c9ae
-     Added a  server
+     Added a
 
 Push a draft changeset without topic
 
@@ -108,7 +111,7 @@
   o  1:d6a8197e192a
   |  Added b  server
   o  0:49a3f206c9ae
-     Added a  server
+     Added a
 
 Pushing multiple changeset with some having topics and some not