diff tests/test-obsolete.t @ 1751:bc590681de77 mercurial-3.4

merge with future 5.5

All was fine for 3.4.

--- a/tests/test-obsolete.t	Fri May 06 00:24:17 2016 +0200
+++ b/tests/test-obsolete.t	Fri Oct 28 17:02:56 2016 +0200
@@ -150,19 +150,19 @@
 
 Test obsolete keyword
 
-  $ hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \
-  >   --hidden
-  @  5:a7a6f2b5d8a5@default(unstable/draft) add d
+  $ hg --hidden log -G \
+  >  --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n'
+  @  5:a7a6f2b5d8a5@default(/draft) add d
   |
-  | o  4:725c380fe99b@default(stable/draft) add obsol_c'
+  | o  4:725c380fe99b@default(/draft) add obsol_c'
   | |
-  x |  3:0d3f46688ccc@default(suspended/draft) add obsol_c
+  x |  3:0d3f46688ccc@default(obsolete/draft) add obsol_c
   |/
-  | x  2:4538525df7e2@default(extinct/draft) add c
+  | x  2:4538525df7e2@default(obsolete/draft) add c
   |/
-  o  1:7c3bad9141dc@default(stable/draft) add b
+  o  1:7c3bad9141dc@default(/draft) add b
   |
-  o  0:1f0dee641bb7@default(stable/public) add a
+  o  0:1f0dee641bb7@default(/public) add a
   
 
 Test communication of obsolete relation with a compatible client