diff tests/test-evolve-effectflags.t @ 3001:67b59d1657cf mercurial-4.2

compat-test: merge future 6.7.0 into 4.2 compat branch

Couple feature to disable and other various test impact.

--- a/tests/test-evolve-effectflags.t	Tue Jul 25 15:17:17 2017 +0200
+++ b/tests/test-evolve-effectflags.t	Wed Sep 27 01:07:22 2017 +0200
@@ -34,7 +34,13 @@
   @  fdf9bde5129a (2) A1
   |
   x  471f378eab4c (1) A0
-       rewritten(description) by test (*) as fdf9bde5129a (glob)
+       rewritten(description) as fdf9bde5129a by test (*) (glob)
+  
+  $ hg log --hidden -r "desc(A0)"
+  changeset:   1:471f378eab4c
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     A0
   
 
 amend touching the user only
@@ -51,7 +57,13 @@
   @  5485c92d3433 (4) B0
   |
   x  ef4a313b1e0a (3) B0
-       rewritten(user) by test (*) as 5485c92d3433 (glob)
+       rewritten(user) as 5485c92d3433 by test (*) (glob)
+  
+  $ hg log --hidden -r "ef4a313b1e0a"
+  changeset:   3:ef4a313b1e0a
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     B0
   
 
 amend touching the date only
@@ -68,7 +80,13 @@
   @  4dd84345082e (6) B1
   |
   x  2ef0680ff450 (5) B1
-       rewritten(date) by test (*) as 4dd84345082e (glob)
+       rewritten(date) as 4dd84345082e by test (*) (glob)
+  
+  $ hg log --hidden -r "2ef0680ff450"
+  changeset:   5:2ef0680ff450
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     B1
   
 
 amend touching the branch only
@@ -89,7 +107,13 @@
   @  14a01456e057 (9) B2
   |
   x  bd3db8264cee (7) B2
-       rewritten(branch) by test (*) as 14a01456e057 (glob)
+       rewritten(branch) as 14a01456e057 by test (*) (glob)
+  
+  $ hg log --hidden -r "bd3db8264cee"
+  changeset:   7:bd3db8264cee
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     B2
   
 
   $ hg up default
@@ -111,7 +135,13 @@
   @  da86aa2f19a3 (12) D0
   |
   x  c85eff83a034 (11) D0
-       rewritten(parent) by test (*) as da86aa2f19a3 (glob)
+       rewritten(parent) as da86aa2f19a3 by test (*) (glob)
+  
+  $ hg log --hidden -r "c85eff83a034"
+  changeset:   11:c85eff83a034
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     D0
   
 
 amend touching the diff
@@ -130,7 +160,13 @@
   @  75781fdbdbf5 (15) E0
   |
   x  ebfe0333e0d9 (13) E0
-       rewritten(content) by test (*) as 75781fdbdbf5 (glob)
+       rewritten(content) as 75781fdbdbf5 by test (*) (glob)
+  
+  $ hg log --hidden -r "ebfe0333e0d9"
+  changeset:   13:ebfe0333e0d9
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     E0
   
 
 amend with multiple effect (desc and meta)
@@ -150,8 +186,15 @@
   @  a94e0fd5f1c8 (18) F1
   |
   x  fad47e5bd78e (16) F0
-       rewritten(description, user, date, branch) by test (*) as a94e0fd5f1c8 (glob)
+       rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob)
   
+  $ hg log --hidden -r "fad47e5bd78e"
+  changeset:   16:fad47e5bd78e
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     F0
+  
+
 rebase not touching the diff
 ----------------------------
 
@@ -197,7 +240,14 @@
   o  e509e2eb3df5 (22) H1
   |
   x  b57fed8d8322 (20) H1
-       rewritten(parent) by test (*) as e509e2eb3df5 (glob)
+       rewritten(parent) as e509e2eb3df5 by test (*) (glob)
+  
+  $ hg log --hidden -r "b57fed8d8322"
+  changeset:   20:b57fed8d8322
+  branch:      my-other-branch
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     H1
   
 amend closing the branch should be detected as meta change
 ----------------------------------------------------------
@@ -214,5 +264,12 @@
   @  12c6238b5e37 (26) I0
   |
   x  2f599e54c1c6 (24) I0
-       rewritten(meta) by test (*) as 12c6238b5e37 (glob)
+       rewritten(meta) as 12c6238b5e37 by test (*) (glob)
   
+  $ hg log --hidden -r "2f599e54c1c6"
+  changeset:   24:2f599e54c1c6
+  branch:      closedbranch
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     I0
+