diff tests/test-obsolete.t @ 2434:37deace44b36 mercurial-3.8

merge with future 6.2.0

No extra change were needed compared to 3.9.

--- a/tests/test-obsolete.t	Thu May 18 23:51:10 2017 +0200
+++ b/tests/test-obsolete.t	Thu May 18 23:55:02 2017 +0200
@@ -150,18 +150,18 @@
 Test obsolete keyword
 
   $ hg --hidden log -G \
-  >  --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n'
-  @  5:a7a6f2b5d8a5@default(draft) add d
+  >  --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n'
+  @  5:a7a6f2b5d8a5@default(/draft) add d
   |
-  | o  4:725c380fe99b@default(draft) add obsol_c'
+  | o  4:725c380fe99b@default(/draft) add obsol_c'
   | |
   x |  3:0d3f46688ccc@default(obsolete/draft) add obsol_c
   |/
   | x  2:4538525df7e2@default(obsolete/draft) add c
   |/
-  o  1:7c3bad9141dc@default(draft) add b
+  o  1:7c3bad9141dc@default(/draft) add b
   |
-  o  0:1f0dee641bb7@default(public) add a
+  o  0:1f0dee641bb7@default(/public) add a
   
 
 Test communication of obsolete relation with a compatible client