Mercurial > evolve
comparison tests/test-stabilize-order.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | 19ec729f3ca2 |
| children | a77fb9669e99 a2fdbece7ce1 |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 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 |/ |
| 138 $ hg amend | 138 $ hg amend |
| 139 1 new orphan changesets | 139 1 new orphan changesets |
| 140 $ glog | 140 $ glog |
| 141 @ 8:7a68bc4596ea@default(draft) addb | 141 @ 8:7a68bc4596ea@default(draft) addb |
| 142 | | 142 | |
| 143 | * 7:0f691739f917@default(draft) addc | 143 | o 7:0f691739f917@default(draft) addc |
| 144 | | | 144 | | |
| 145 | x 6:81b8bbcd5892@default(draft) addb | 145 | x 6:81b8bbcd5892@default(draft) addb |
| 146 |/ | 146 |/ |
| 147 o 5:005fe5914f78@default(draft) adda | 147 o 5:005fe5914f78@default(draft) adda |
| 148 | | 148 | |
| 201 | parent: 8:7a68bc4596ea | 201 | parent: 8:7a68bc4596ea |
| 202 | user: test | 202 | user: test |
| 203 | date: Thu Jan 01 00:00:00 1970 +0000 | 203 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 204 | summary: newmessage | 204 | summary: newmessage |
| 205 | | 205 | |
| 206 | * changeset: 11:fa68011f392e | 206 | o changeset: 11:fa68011f392e |
| 207 | | parent: 9:2256dae6521f | 207 | | parent: 9:2256dae6521f |
| 208 | | user: test | 208 | | user: test |
| 209 | | date: Thu Jan 01 00:00:00 1970 +0000 | 209 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 210 | | instability: orphan | 210 | | instability: orphan |
| 211 | | summary: secondambiguous | 211 | | summary: secondambiguous |
| 212 | | | 212 | | |
| 213 | | * changeset: 10:bdc003b6eec2 | 213 | | o changeset: 10:bdc003b6eec2 |
| 214 | |/ user: test | 214 | |/ user: test |
| 215 | | date: Thu Jan 01 00:00:00 1970 +0000 | 215 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 216 | | instability: orphan | 216 | | instability: orphan |
| 217 | | summary: firstambiguous | 217 | | summary: firstambiguous |
| 218 | | | 218 | | |