diff tests/test-topic-change.t @ 4356:a71f2271ed76 mercurial-4.8

branching: merge with future version

--- a/tests/test-topic-change.t	Tue Jan 22 10:43:44 2019 -0500
+++ b/tests/test-topic-change.t	Tue Jan 22 10:46:02 2019 -0500
@@ -51,7 +51,7 @@
 Clearing topic from revision without topic
 
   $ hg topic -r . --clear
-  changed topic on 0 changes
+  cleared topic on 0 changesets
 
 Clearing current topic when no active topic is not error
 
@@ -62,7 +62,7 @@
 
   $ hg topic -r 0:: foo
   switching to topic foo
-  changed topic on 8 changes
+  changed topic on 8 changesets to "foo"
   $ hg glog
   @  15:05095f607171 {foo}
   |  Added h  ()
@@ -100,7 +100,7 @@
 
   $ hg topic -r abcedffeae90:: bar
   switching to topic bar
-  changed topic on 4 changes
+  changed topic on 4 changesets to "bar"
   $ hg glog
   @  19:d7d36e193ea7 {bar}
   |  Added h  ()
@@ -139,7 +139,7 @@
   $ hg topic -r . --current
   active topic 'foobar' grew its first changeset
   (see 'hg help topics' for more information)
-  changed topic on 1 changes
+  changed topic on 1 changesets to "foobar"
   $ hg glog -r .
   @  20:c2d6b7df5dcf {foobar}
   |  Added h  ()
@@ -149,7 +149,7 @@
 
   $ hg topic -r 9::10 --current
   5 new orphan changesets
-  changed topic on 2 changes
+  changed topic on 2 changesets to "foobar"
   $ hg glog
   o  22:1b88140feefe {foobar}
   |  Added c  ()
@@ -302,7 +302,7 @@
   $ hg topic -r . --clear
   clearing empty topic "watwat"
   active topic 'watwat' is now empty
-  changed topic on 1 changes
+  cleared topic on 1 changesets
 
   $ hg glog
   @  31:c48d6d71b2d9 {}
@@ -335,7 +335,7 @@
   $ hg bookmark bookboo
   $ hg topic -r . movebook
   switching to topic movebook
-  changed topic on 1 changes
+  changed topic on 1 changesets to "movebook"
   $ hg glog
   @  32:1b83d11095b9 {movebook}
   |  Added h  (book bookboo)
@@ -376,7 +376,7 @@
   $ hg topic -r . watwat
   switching to topic watwat
   1 new orphan changesets
-  changed topic on 1 changes
+  changed topic on 1 changesets to "watwat"
 
   $ hg glog
   @  33:894983f69e69 {watwat}