Mercurial > evolve

diff tests/test-stabilize-order.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-stabilize-order.t	Wed Sep 13 15:13:51 2017 +0200
+++ b/tests/test-stabilize-order.t	Fri Sep 15 15:48:18 2017 +0200
@@ -47,9 +47,9 @@
   $ hg amend
   1 new orphan changesets
   $ glog
-  @  7:005fe5914f78@default(draft) adda
+  @  5:005fe5914f78@default(draft) adda
   |
-  | o  5:22619daeed78@default(draft) addb
+  | o  4:22619daeed78@default(draft) addb
   | |
   | | o  3:7a7552255fb5@default(draft) addc
   | | |
@@ -63,8 +63,8 @@
 Test stabilizing a predecessor child
 
   $ hg evolve -v
-  move:[5] addb
-  atop:[7] adda
+  move:[4] addb
+  atop:[5] adda
   hg rebase -r 22619daeed78 -d 005fe5914f78
   resolving manifests
   getting b
@@ -74,9 +74,9 @@
   committing changelog
   working directory is now at 81b8bbcd5892
   $ glog
-  @  8:81b8bbcd5892@default(draft) addb
+  @  6:81b8bbcd5892@default(draft) addb
   |
-  o  7:005fe5914f78@default(draft) adda
+  o  5:005fe5914f78@default(draft) adda
   |
   | o  3:7a7552255fb5@default(draft) addc
   | |
@@ -89,12 +89,12 @@
 
 Test stabilizing a descendant predecessor's child
 
-  $ hg up 7
+  $ hg up -r 005fe5914f78
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete > successors.old
   $ hg evolve -v
   move:[3] addc
-  atop:[8] addb
+  atop:[6] addb
   hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
   resolving manifests
   getting b
@@ -109,9 +109,9 @@
   $ diff -u successors.old successors.new
   --- successors.old* (glob)
   +++ successors.new* (glob)
-  @@ -3,3 +3,4 @@
+  @@ -1,3 +1,4 @@
+   ef23d6ef94d68dea65d20587dfecc8b33d165617 22619daeed78036f80fbd326b6852519c4f0c25e 0 (*) {'ef1': '8', 'user': 'test'} (glob)
    93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '8', 'user': 'test'} (glob)
-   7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '0', 'user': 'test'} (glob)
    22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '4', 'user': 'test'} (glob)
   +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '4', 'user': 'test'} (glob)
   [1]
@@ -119,11 +119,11 @@
 
 
   $ glog
-  @  9:0f691739f917@default(draft) addc
+  @  7:0f691739f917@default(draft) addc
   |
-  o  8:81b8bbcd5892@default(draft) addb
+  o  6:81b8bbcd5892@default(draft) addb
   |
-  o  7:005fe5914f78@default(draft) adda
+  o  5:005fe5914f78@default(draft) adda
   |
   o  0:c471ef929e6a@default(draft) addroot
   
@@ -133,31 +133,31 @@
 
 Test behavior with --any
 
-  $ hg up 8
+  $ hg up 81b8bbcd5892
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
   1 new orphan changesets
   $ glog
-  @  11:7a68bc4596ea@default(draft) addb
+  @  8:7a68bc4596ea@default(draft) addb
   |
-  | o  9:0f691739f917@default(draft) addc
+  | o  7:0f691739f917@default(draft) addc
   | |
-  | x  8:81b8bbcd5892@default(draft) addb
+  | x  6:81b8bbcd5892@default(draft) addb
   |/
-  o  7:005fe5914f78@default(draft) adda
+  o  5:005fe5914f78@default(draft) adda
   |
   o  0:c471ef929e6a@default(draft) addroot
   
-  $ hg up 9
+  $ hg up 0f691739f917
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg evolve -v
   nothing to evolve on current working copy parent
   (1 other orphan in the repository, do you want --any or --rev)
   [2]
   $ hg evolve --any -v
-  move:[9] addc
-  atop:[11] addb
+  move:[7] addc
+  atop:[8] addb
   hg rebase -r 0f691739f917 -d 7a68bc4596ea
   resolving manifests
   removing c
@@ -170,11 +170,11 @@
   committing changelog
   working directory is now at 2256dae6521f
   $ glog
-  @  12:2256dae6521f@default(draft) addc
+  @  9:2256dae6521f@default(draft) addc
   |
-  o  11:7a68bc4596ea@default(draft) addb
+  o  8:7a68bc4596ea@default(draft) addb
   |
-  o  7:005fe5914f78@default(draft) adda
+  o  5:005fe5914f78@default(draft) adda
   |
   o  0:c471ef929e6a@default(draft) addroot
   
@@ -197,39 +197,39 @@
   $ hg commit --amend -m "newmessage"
   2 new orphan changesets
   $ hg log -G
-  @  changeset:   15:f83a0bce03e4
+  @  changeset:   12:f83a0bce03e4
   |  tag:         tip
-  |  parent:      11:7a68bc4596ea
+  |  parent:      8:7a68bc4596ea
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     newmessage
   |
-  | o  changeset:   14:fa68011f392e
-  | |  parent:      12:2256dae6521f
+  | o  changeset:   11:fa68011f392e
+  | |  parent:      9:2256dae6521f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     secondambiguous
   | |
-  | | o  changeset:   13:bdc003b6eec2
+  | | o  changeset:   10:bdc003b6eec2
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    instability: orphan
   | |    summary:     firstambiguous
   | |
-  | x  changeset:   12:2256dae6521f
+  | x  changeset:   9:2256dae6521f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    reworded as f83a0bce03e4
   |    summary:     addc
   |
-  o  changeset:   11:7a68bc4596ea
-  |  parent:      7:005fe5914f78
+  o  changeset:   8:7a68bc4596ea
+  |  parent:      5:005fe5914f78
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     addb
   |
-  o  changeset:   7:005fe5914f78
+  o  changeset:   5:005fe5914f78
   |  parent:      0:c471ef929e6a
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000