Mercurial > evolve
comparison tests/test-evolve-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 | d5adce52cef4 |
| children | 98941c28f3e2 e268f7fd7839 |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 46 $ hg amend | 46 $ hg amend |
| 47 2 new orphan changesets | 47 2 new orphan changesets |
| 48 $ hg log -G | 48 $ hg log -G |
| 49 @ 4:12d519679175@default(draft) add _a | 49 @ 4:12d519679175@default(draft) add _a |
| 50 | | 50 | |
| 51 | * 3:4d156641b718@default(draft) add _c | 51 | o 3:4d156641b718@default(draft) add _c |
| 52 | | | 52 | | |
| 53 | * 2:4d7242ebb004@default(draft) add _b | 53 | o 2:4d7242ebb004@default(draft) add _b |
| 54 | | | 54 | | |
| 55 | x 1:2d73fcd7f07d@default(draft) add _a | 55 | x 1:2d73fcd7f07d@default(draft) add _a |
| 56 |/ | 56 |/ |
| 57 o 0:f92638be10c7@default(public) add p | 57 o 0:f92638be10c7@default(public) add p |
| 58 | 58 |
| 86 $ hg amend -m "asecond" | 86 $ hg amend -m "asecond" |
| 87 1 new orphan changesets | 87 1 new orphan changesets |
| 88 $ hg log -G | 88 $ hg log -G |
| 89 @ 11:9a584314f3f3@default(draft) asecond | 89 @ 11:9a584314f3f3@default(draft) asecond |
| 90 | | 90 | |
| 91 | * 10:a59c79776f7c@default(draft) bprime | 91 | o 10:a59c79776f7c@default(draft) bprime |
| 92 | | | 92 | | |
| 93 | x 8:81a687b96d4d@default(draft) aprime | 93 | x 8:81a687b96d4d@default(draft) aprime |
| 94 |/ | 94 |/ |
| 95 | * 7:464731bc0ed0@default(draft) add _d | 95 | o 7:464731bc0ed0@default(draft) add _d |
| 96 | | | 96 | | |
| 97 | * 6:52b8f9b04f83@default(draft) add _c | 97 | o 6:52b8f9b04f83@default(draft) add _c |
| 98 | | | 98 | | |
| 99 | x 5:59476c3836ef@default(draft) add _b | 99 | x 5:59476c3836ef@default(draft) add _b |
| 100 | | | 100 | | |
| 101 | x 4:12d519679175@default(draft) add _a | 101 | x 4:12d519679175@default(draft) add _a |
| 102 |/ | 102 |/ |
| 138 1 changesets pruned | 138 1 changesets pruned |
| 139 1 new orphan changesets | 139 1 new orphan changesets |
| 140 $ hg log -G -r "desc(_d)::" | 140 $ hg log -G -r "desc(_d)::" |
| 141 @ 21:dcf786e878fd@default(draft) add c1second | 141 @ 21:dcf786e878fd@default(draft) add c1second |
| 142 | | 142 | |
| 143 | * 20:507d52d715f6@default(draft) add c2prime | 143 | o 20:507d52d715f6@default(draft) add c2prime |
| 144 | | | 144 | | |
| 145 | x 19:c995cb124ddc@default(draft) add c1prime | 145 | x 19:c995cb124ddc@default(draft) add c1prime |
| 146 |/ | 146 |/ |
| 147 | * 18:d096a2437fd0@default(draft) add c4_ | 147 | o 18:d096a2437fd0@default(draft) add c4_ |
| 148 | | | 148 | | |
| 149 | * 17:cde95c6cba7a@default(draft) add c3_ | 149 | o 17:cde95c6cba7a@default(draft) add c3_ |
| 150 | | | 150 | | |
| 151 | x 16:e0d9f7a099fe@default(draft) add c2_ | 151 | x 16:e0d9f7a099fe@default(draft) add c2_ |
| 152 | | | 152 | | |
| 153 | x 15:43b7c338b1f8@default(draft) add c1_ | 153 | x 15:43b7c338b1f8@default(draft) add c1_ |
| 154 |/ | 154 |/ |
| 170 $ hg log -G -r "desc(_d)::" | 170 $ hg log -G -r "desc(_d)::" |
| 171 @ 27:b253ff5b65d1@default(draft) add b3prime | 171 @ 27:b253ff5b65d1@default(draft) add b3prime |
| 172 | | 172 | |
| 173 o 26:4acf61f11dfb@default(draft) add b1prime | 173 o 26:4acf61f11dfb@default(draft) add b1prime |
| 174 | | 174 | |
| 175 | * 25:594e1fbbd61f@default(draft) add b4_ | 175 | o 25:594e1fbbd61f@default(draft) add b4_ |
| 176 | | | 176 | | |
| 177 | x 24:be27500cfc76@default(draft) add b3_ | 177 | x 24:be27500cfc76@default(draft) add b3_ |
| 178 | | | 178 | | |
| 179 | x 23:b54f77dc5831@default(draft) add b2_ | 179 | x 23:b54f77dc5831@default(draft) add b2_ |
| 180 | | | 180 | | |
| 181 | x 22:0e1eba27e9aa@default(draft) add b1_ | 181 | x 22:0e1eba27e9aa@default(draft) add b1_ |
| 182 |/ | 182 |/ |
| 183 | o 21:dcf786e878fd@default(draft) add c1second | 183 | o 21:dcf786e878fd@default(draft) add c1second |
| 184 |/ | 184 |/ |
| 185 | * 20:507d52d715f6@default(draft) add c2prime | 185 | o 20:507d52d715f6@default(draft) add c2prime |
| 186 | | | 186 | | |
| 187 | x 19:c995cb124ddc@default(draft) add c1prime | 187 | x 19:c995cb124ddc@default(draft) add c1prime |
| 188 |/ | 188 |/ |
| 189 | * 18:d096a2437fd0@default(draft) add c4_ | 189 | o 18:d096a2437fd0@default(draft) add c4_ |
| 190 | | | 190 | | |
| 191 | * 17:cde95c6cba7a@default(draft) add c3_ | 191 | o 17:cde95c6cba7a@default(draft) add c3_ |
| 192 | | | 192 | | |
| 193 | x 16:e0d9f7a099fe@default(draft) add c2_ | 193 | x 16:e0d9f7a099fe@default(draft) add c2_ |
| 194 | | | 194 | | |
| 195 | x 15:43b7c338b1f8@default(draft) add c1_ | 195 | x 15:43b7c338b1f8@default(draft) add c1_ |
| 196 |/ | 196 |/ |