Mercurial > evolve
comparison tests/test-stabilize-order.t @ 3106:a867d59ea97a mercurial-4.3
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 20:04:13 +0200 |
| parents | f5d472b7e800 |
| children | 9c9c8c1eeb93 9f900937c198 |
comparison
equal
deleted
inserted
replaced
| 3105:f5d472b7e800 | 3106:a867d59ea97a |
|---|---|
| 36 gdown have been deprecated in favor of previous | 36 gdown have been deprecated in favor of previous |
| 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 38 [2] addb | 38 [2] addb |
| 39 $ echo b >> b | 39 $ echo b >> b |
| 40 $ hg amend | 40 $ hg amend |
| 41 1 new orphan changesets | 41 1 new unstable changesets |
| 42 $ hg gdown | 42 $ hg gdown |
| 43 gdown have been deprecated in favor of previous | 43 gdown have been deprecated in favor of previous |
| 44 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 44 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 45 [1] adda | 45 [1] adda |
| 46 $ echo a >> a | 46 $ echo a >> a |
| 47 $ hg amend | 47 $ hg amend |
| 48 1 new orphan changesets | 48 1 new unstable changesets |
| 49 $ glog | 49 $ glog |
| 50 @ 7:005fe5914f78@default(draft) adda | 50 @ 7:005fe5914f78@default(draft) adda |
| 51 | | 51 | |
| 52 | o 5:22619daeed78@default(draft) addb | 52 | o 5:22619daeed78@default(draft) addb |
| 53 | | | 53 | | |
| 108 $ hg debugobsolete > successors.new | 108 $ hg debugobsolete > successors.new |
| 109 $ diff -u successors.old successors.new | 109 $ diff -u successors.old successors.new |
| 110 --- successors.old* (glob) | 110 --- successors.old* (glob) |
| 111 +++ successors.new* (glob) | 111 +++ successors.new* (glob) |
| 112 @@ -3,3 +3,4 @@ | 112 @@ -3,3 +3,4 @@ |
| 113 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '8', 'user': 'test'} (glob) | 113 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 114 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '0', 'user': 'test'} (glob) | 114 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 115 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '4', 'user': 'test'} (glob) | 115 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 116 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '4', 'user': 'test'} (glob) | 116 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 117 [1] | 117 [1] |
| 118 | 118 |
| 119 | 119 |
| 120 | 120 |
| 121 $ glog | 121 $ glog |
| 135 | 135 |
| 136 $ hg up 8 | 136 $ hg up 8 |
| 137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 138 $ echo b >> b | 138 $ echo b >> b |
| 139 $ hg amend | 139 $ hg amend |
| 140 1 new orphan changesets | 140 1 new unstable changesets |
| 141 $ glog | 141 $ glog |
| 142 @ 11:7a68bc4596ea@default(draft) addb | 142 @ 11:7a68bc4596ea@default(draft) addb |
| 143 | | 143 | |
| 144 | o 9:0f691739f917@default(draft) addc | 144 | o 9:0f691739f917@default(draft) addc |
| 145 | | | 145 | | |
| 193 $ hg ci -m secondambiguous | 193 $ hg ci -m secondambiguous |
| 194 created new head | 194 created new head |
| 195 $ hg up .^ | 195 $ hg up .^ |
| 196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 197 $ hg commit --amend -m "newmessage" | 197 $ hg commit --amend -m "newmessage" |
| 198 2 new orphan changesets | 198 2 new unstable changesets |
| 199 $ hg log -G | 199 $ hg log -G |
| 200 @ changeset: 15:f83a0bce03e4 | 200 @ changeset: 15:f83a0bce03e4 |
| 201 | tag: tip | 201 | tag: tip |
| 202 | parent: 11:7a68bc4596ea | 202 | parent: 11:7a68bc4596ea |
| 203 | user: test | 203 | user: test |
| 206 | | 206 | |
| 207 | o changeset: 14:fa68011f392e | 207 | o changeset: 14:fa68011f392e |
| 208 | | parent: 12:2256dae6521f | 208 | | parent: 12:2256dae6521f |
| 209 | | user: test | 209 | | user: test |
| 210 | | date: Thu Jan 01 00:00:00 1970 +0000 | 210 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 211 | | instability: orphan | 211 | | trouble: unstable |
| 212 | | summary: secondambiguous | 212 | | summary: secondambiguous |
| 213 | | | 213 | | |
| 214 | | o changeset: 13:bdc003b6eec2 | 214 | | o changeset: 13:bdc003b6eec2 |
| 215 | |/ user: test | 215 | |/ user: test |
| 216 | | date: Thu Jan 01 00:00:00 1970 +0000 | 216 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 217 | | instability: orphan | 217 | | trouble: unstable |
| 218 | | summary: firstambiguous | 218 | | summary: firstambiguous |
| 219 | | | 219 | | |
| 220 | x changeset: 12:2256dae6521f | 220 | x changeset: 12:2256dae6521f |
| 221 |/ user: test | 221 |/ user: test |
| 222 | date: Thu Jan 01 00:00:00 1970 +0000 | 222 | date: Thu Jan 01 00:00:00 1970 +0000 |