Mercurial > evolve
comparison tests/test-evolve-abort-orphan.t @ 3995:684cc3418ecd mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 21 Aug 2018 13:26:35 +0200 |
| parents | d00f0c369bc7 b4d0245c7f40 |
| children | 21eab0a99841 e268f7fd7839 |
comparison
equal
deleted
inserted
replaced
| 3935:9af0e2b0bdd7 | 3995:684cc3418ecd |
|---|---|
| 85 atop:[5] added c | 85 atop:[5] added c |
| 86 merging d | 86 merging d |
| 87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 88 fix conflicts and see `hg help evolve.interrupted` | 88 fix conflicts and see `hg help evolve.interrupted` |
| 89 [1] | 89 [1] |
| 90 | |
| 91 $ hg parents | |
| 92 changeset: 5:e93a9161a274 | |
| 93 tag: tip | |
| 94 parent: 2:b1661037fa25 | |
| 95 user: test | |
| 96 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 97 summary: added c | |
| 98 | |
| 99 changeset: 4:c41c793e0ef1 | |
| 100 user: test | |
| 101 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 102 instability: orphan | |
| 103 summary: added d | |
| 104 | |
| 90 | 105 |
| 91 $ hg evolve --abort | 106 $ hg evolve --abort |
| 92 evolve aborted | 107 evolve aborted |
| 93 working directory is now at e93a9161a274 | 108 working directory is now at e93a9161a274 |
| 94 | 109 |
| 171 | () draft | 186 | () draft |
| 172 o 7:125af0ed8cae added a | 187 o 7:125af0ed8cae added a |
| 173 | () draft | 188 | () draft |
| 174 | o 6:e83de241f751 added d | 189 | o 6:e83de241f751 added d |
| 175 | | () draft | 190 | | () draft |
| 176 | o 5:e93a9161a274 added c | 191 | @ 5:e93a9161a274 added c |
| 177 | | () draft | 192 | | () draft |
| 178 | x 2:b1661037fa25 added b | 193 | x 2:b1661037fa25 added b |
| 179 | | () draft | 194 | | () draft |
| 180 | x 1:c7586e2a9264 added a | 195 | x 1:c7586e2a9264 added a |
| 181 |/ () draft | 196 |/ () draft |
| 263 | () draft | 278 | () draft |
| 264 | o 8:db3b42ef4da7 added b | 279 | o 8:db3b42ef4da7 added b |
| 265 |/ () draft | 280 |/ () draft |
| 266 @ 7:807e8e2ca559 added a | 281 @ 7:807e8e2ca559 added a |
| 267 | () draft | 282 | () draft |
| 268 | o 6:8f20d4390c21 foo to a | 283 | @ 6:8f20d4390c21 foo to a |
| 269 | | () draft | 284 | | () draft |
| 270 | | o 5:bcb1c47f8520 added d | 285 | | o 5:bcb1c47f8520 added d |
| 271 | | | () draft | 286 | | | () draft |
| 272 | | x 4:86d2603075a3 added c | 287 | | x 4:86d2603075a3 added c |
| 273 | |/ () draft | 288 | |/ () draft |
| 325 | () draft | 340 | () draft |
| 326 | o 8:db3b42ef4da7 added b | 341 | o 8:db3b42ef4da7 added b |
| 327 |/ () draft | 342 |/ () draft |
| 328 @ 7:807e8e2ca559 added a | 343 @ 7:807e8e2ca559 added a |
| 329 | () draft | 344 | () draft |
| 330 | o 6:8f20d4390c21 foo to a | 345 | @ 6:8f20d4390c21 foo to a |
| 331 | | () draft | 346 | | () draft |
| 332 | | o 5:bcb1c47f8520 added d | 347 | | o 5:bcb1c47f8520 added d |
| 333 | | | () draft | 348 | | | () draft |
| 334 | | x 4:86d2603075a3 added c | 349 | | x 4:86d2603075a3 added c |
| 335 | |/ () draft | 350 | |/ () draft |
| 408 | | () draft | 423 | | () draft |
| 409 | o 8:db3b42ef4da7 added b | 424 | o 8:db3b42ef4da7 added b |
| 410 |/ () draft | 425 |/ () draft |
| 411 @ 7:807e8e2ca559 added a | 426 @ 7:807e8e2ca559 added a |
| 412 | () draft | 427 | () draft |
| 413 | o 6:8f20d4390c21 foo to a | 428 | @ 6:8f20d4390c21 foo to a |
| 414 | | () draft | 429 | | () draft |
| 415 | x 1:2f913b0c9220 added a | 430 | x 1:2f913b0c9220 added a |
| 416 |/ () draft | 431 |/ () draft |
| 417 o 0:8fa14d15e168 added hgignore | 432 o 0:8fa14d15e168 added hgignore |
| 418 () draft | 433 () draft |
| 476 $ hg glog | 491 $ hg glog |
| 477 @ 5:c1f4718020e3 added b | 492 @ 5:c1f4718020e3 added b |
| 478 | (bm1) draft | 493 | (bm1) draft |
| 479 o 4:a0086c17bfc7 added a | 494 o 4:a0086c17bfc7 added a |
| 480 | () draft | 495 | () draft |
| 481 | o 3:17509928e5bf added c | 496 | @ 3:17509928e5bf added c |
| 482 | | () draft | 497 | | () draft |
| 483 | x 2:9f0c80a55ddc added b | 498 | x 2:9f0c80a55ddc added b |
| 484 | | () draft | 499 | | () draft |
| 485 | x 1:2f913b0c9220 added a | 500 | x 1:2f913b0c9220 added a |
| 486 |/ () draft | 501 |/ () draft |
| 519 [1] | 534 [1] |
| 520 | 535 |
| 521 $ hg evolve --abort | 536 $ hg evolve --abort |
| 522 evolve aborted | 537 evolve aborted |
| 523 working directory is now at c1f4718020e3 | 538 working directory is now at c1f4718020e3 |
| 539 | |
| 540 $ ls .hg/ | |
| 541 00changelog.i | |
| 542 bookmarks | |
| 543 branch | |
| 544 cache | |
| 545 dirstate | |
| 546 last-message.txt | |
| 547 requires | |
| 548 store | |
| 549 undo.backup.bookmarks | |
| 550 undo.backup.dirstate | |
| 551 undo.bookmarks | |
| 552 undo.branch | |
| 553 undo.desc | |
| 554 undo.dirstate |