diff tests/test-topic.t @ 3108:9c9c8c1eeb93 mercurial-4.2

test-compat: merge with mercurial-4.3 branch

--- a/tests/test-topic.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-topic.t	Fri Oct 20 18:34:22 2017 +0200
@@ -653,7 +653,7 @@
   t0^ Add file delta (base current)
 
   $ hg topics --age
-   * fran (1970-01-01 by test)
+   * fran (* by test) (glob)
 
   $ cd ..
 
@@ -701,11 +701,11 @@
 
   $ hg add b
   $ hg topic topic1990
-  $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo"
+  $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" --date "631152000 0"
   active topic 'topic1990' grew its first changeset
   $ hg add c
   $ hg topic topic2010
-  $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar"
+  $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" --date "1262304000 0"
   active topic 'topic2010' grew its first changeset
 
   $ hg log -G
@@ -735,18 +735,18 @@
    * topic2010 (1 changesets)
 
   $ hg topics --age
-   * topic2010 (2010-01-01 by bar)
-     topic1990 (1990-01-01 by foo)
-     topic1970 (1970-01-01 by test)
+     topic1970 (* by test) (glob)
+   * topic2010 (* by bar) (glob)
+     topic1990 (* by foo) (glob)
 
   $ hg up topic1970
   switching to topic topic1970
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ hg topics --age
-     topic2010 (2010-01-01 by bar)
-     topic1990 (1990-01-01 by foo)
-   * topic1970 (1970-01-01 by test)
+   * topic1970 (* by test) (glob)
+     topic2010 (* by bar) (glob)
+     topic1990 (* by foo) (glob)
 
   $ hg topics --age random
   abort: cannot use --age while setting a topic