Mercurial > evolve

diff tests/test-evolve-effectflags.t @ 2929:06844693bb21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 462adae9fea7
children
line wrap: on
line diff
--- a/tests/test-evolve-effectflags.t	Wed Sep 13 15:13:51 2017 +0200
+++ b/tests/test-evolve-effectflags.t	Fri Sep 15 15:48:18 2017 +0200
@@ -104,10 +104,9 @@
 check result
 
   $ hg debugobsolete --rev .
-  4d1430a201c1ffbd8465dec75edd4a691a2d97ec 0 {bd3db8264ceebf1966319f5df3be7aac6acd1a8e} (*) {'ef1': '0', 'user': 'test'} (glob)
   bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob)
   $ hg obslog .
-  @  14a01456e057 (9) B2
+  @  14a01456e057 (8) B2
   |
   x  bd3db8264cee (7) B2
        rewritten(branch) as 14a01456e057 by test (*) (glob)
@@ -129,20 +128,20 @@
   $ mkcommit C0
   $ mkcommit D0
   $ hg rebase -r . -d 'desc(B0)'
-  rebasing 11:c85eff83a034 "D0" (tip)
+  rebasing 10:c85eff83a034 "D0" (tip)
 
 check result
 
   $ hg debugobsolete --rev .
   c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob)
   $ hg obslog .
-  @  da86aa2f19a3 (12) D0
+  @  da86aa2f19a3 (11) D0
   |
-  x  c85eff83a034 (11) D0
+  x  c85eff83a034 (10) D0
        rewritten(parent) as da86aa2f19a3 by test (*) (glob)
   
   $ hg log --hidden -r "c85eff83a034"
-  changeset:   11:c85eff83a034
+  changeset:   10:c85eff83a034
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   obsolete:    rebased as da86aa2f19a3
@@ -159,16 +158,15 @@
 check result
 
   $ hg debugobsolete --rev .
-  d6f4d8b8d3c8cde990f13915bced7f92ce1cc54f 0 {ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f} (*) {'ef1': '0', 'user': 'test'} (glob)
   ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob)
   $ hg obslog .
-  @  75781fdbdbf5 (15) E0
+  @  75781fdbdbf5 (13) E0
   |
-  x  ebfe0333e0d9 (13) E0
+  x  ebfe0333e0d9 (12) E0
        rewritten(content) as 75781fdbdbf5 by test (*) (glob)
   
   $ hg log --hidden -r "ebfe0333e0d9"
-  changeset:   13:ebfe0333e0d9
+  changeset:   12:ebfe0333e0d9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   obsolete:    amended as 75781fdbdbf5
@@ -186,16 +184,15 @@
 check result
 
   $ hg debugobsolete --rev .
-  3b12912003b4e7aa6df6cded86255006c3c29d27 0 {fad47e5bd78e6aa4db1b5a0a1751bc12563655ff} (*) {'ef1': '0', 'user': 'test'} (glob)
   fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob)
   $ hg obslog .
-  @  a94e0fd5f1c8 (18) F1
+  @  a94e0fd5f1c8 (15) F1
   |
-  x  fad47e5bd78e (16) F0
+  x  fad47e5bd78e (14) F0
        rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob)
   
   $ hg log --hidden -r "fad47e5bd78e"
-  changeset:   16:fad47e5bd78e
+  changeset:   14:fad47e5bd78e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   obsolete:    rewritten as a94e0fd5f1c8
@@ -241,16 +238,16 @@
   $ hg commit -m "H2"
   created new head
   $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3
-  rebasing 20:b57fed8d8322 "H1"
+  rebasing 17:b57fed8d8322 "H1"
   merging H0
   $ hg obslog tip
-  o  e509e2eb3df5 (22) H1
+  o  e509e2eb3df5 (19) H1
   |
-  x  b57fed8d8322 (20) H1
+  x  b57fed8d8322 (17) H1
        rewritten(parent) as e509e2eb3df5 by test (*) (glob)
   
   $ hg log --hidden -r "b57fed8d8322"
-  changeset:   20:b57fed8d8322
+  changeset:   17:b57fed8d8322
   branch:      my-other-branch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -269,13 +266,13 @@
 check result
 
   $ hg obslog .
-  @  12c6238b5e37 (26) I0
+  @  12c6238b5e37 (22) I0
   |
-  x  2f599e54c1c6 (24) I0
+  x  2f599e54c1c6 (21) I0
        rewritten(meta) as 12c6238b5e37 by test (*) (glob)
   
   $ hg log --hidden -r "2f599e54c1c6"
-  changeset:   24:2f599e54c1c6
+  changeset:   21:2f599e54c1c6
   branch:      closedbranch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000