Mercurial > evolve
comparison tests/test-stabilize-order.t @ 3411:e1f3e43a50a4 stable
branching: backed out test output changes from core-1905aac253f0
This backs out evolve-ae6fddf39933
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 19:52:00 +0100 |
| parents | ae6fddf39933 |
| children | 85cdce113c2c d3a17c67f85c |
comparison
equal
deleted
inserted
replaced
| 3410:39112fd4d5ed | 3411:e1f3e43a50a4 |
|---|---|
| 47 $ hg amend | 47 $ hg amend |
| 48 1 new orphan changesets | 48 1 new orphan changesets |
| 49 $ glog | 49 $ glog |
| 50 @ 5:005fe5914f78@default(draft) adda | 50 @ 5:005fe5914f78@default(draft) adda |
| 51 | | 51 | |
| 52 | * 4:22619daeed78@default(draft) addb | 52 | o 4:22619daeed78@default(draft) addb |
| 53 | | | 53 | | |
| 54 | | * 3:7a7552255fb5@default(draft) addc | 54 | | o 3:7a7552255fb5@default(draft) addc |
| 55 | | | | 55 | | | |
| 56 | | x 2:ef23d6ef94d6@default(draft) addb | 56 | | x 2:ef23d6ef94d6@default(draft) addb |
| 57 | |/ | 57 | |/ |
| 58 | x 1:93418d2c0979@default(draft) adda | 58 | x 1:93418d2c0979@default(draft) adda |
| 59 |/ | 59 |/ |
| 76 $ glog | 76 $ glog |
| 77 @ 6:81b8bbcd5892@default(draft) addb | 77 @ 6:81b8bbcd5892@default(draft) addb |
| 78 | | 78 | |
| 79 o 5:005fe5914f78@default(draft) adda | 79 o 5:005fe5914f78@default(draft) adda |
| 80 | | 80 | |
| 81 | * 3:7a7552255fb5@default(draft) addc | 81 | o 3:7a7552255fb5@default(draft) addc |
| 82 | | | 82 | | |
| 83 | x 2:ef23d6ef94d6@default(draft) addb | 83 | x 2:ef23d6ef94d6@default(draft) addb |
| 84 | | | 84 | | |
| 85 | x 1:93418d2c0979@default(draft) adda | 85 | x 1:93418d2c0979@default(draft) adda |
| 86 |/ | 86 |/ |
| 139 $ hg amend | 139 $ hg amend |
| 140 1 new orphan changesets | 140 1 new orphan changesets |
| 141 $ glog | 141 $ glog |
| 142 @ 8:7a68bc4596ea@default(draft) addb | 142 @ 8:7a68bc4596ea@default(draft) addb |
| 143 | | 143 | |
| 144 | * 7:0f691739f917@default(draft) addc | 144 | o 7:0f691739f917@default(draft) addc |
| 145 | | | 145 | | |
| 146 | x 6:81b8bbcd5892@default(draft) addb | 146 | x 6:81b8bbcd5892@default(draft) addb |
| 147 |/ | 147 |/ |
| 148 o 5:005fe5914f78@default(draft) adda | 148 o 5:005fe5914f78@default(draft) adda |
| 149 | | 149 | |
| 202 | parent: 8:7a68bc4596ea | 202 | parent: 8:7a68bc4596ea |
| 203 | user: test | 203 | user: test |
| 204 | date: Thu Jan 01 00:00:00 1970 +0000 | 204 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 205 | summary: newmessage | 205 | summary: newmessage |
| 206 | | 206 | |
| 207 | * changeset: 11:fa68011f392e | 207 | o changeset: 11:fa68011f392e |
| 208 | | parent: 9:2256dae6521f | 208 | | parent: 9: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 | | instability: orphan |
| 212 | | summary: secondambiguous | 212 | | summary: secondambiguous |
| 213 | | | 213 | | |
| 214 | | * changeset: 10:bdc003b6eec2 | 214 | | o changeset: 10: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 | | instability: orphan |
| 218 | | summary: firstambiguous | 218 | | summary: firstambiguous |
| 219 | | | 219 | | |