Mercurial > evolve
comparison tests/test-evolve-abort-orphan.t @ 3994:e39ef1eff75a mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 21 Aug 2018 13:25:29 +0200 |
| parents | b4d0245c7f40 |
| children | 684cc3418ecd 4eb3877540f1 |
comparison
equal
deleted
inserted
replaced
| 3934:d55a6fef9eb9 | 3994:e39ef1eff75a |
|---|---|
| 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 | * 6:e83de241f751 added d | 189 | * 6:e83de241f751 added d |
| 175 | | () draft | 190 | | () draft |
| 176 | * 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 |
| 264 | () draft | 279 | () draft |
| 265 | o 8:db3b42ef4da7 added b | 280 | o 8:db3b42ef4da7 added b |
| 266 |/ () draft | 281 |/ () draft |
| 267 @ 7:807e8e2ca559 added a | 282 @ 7:807e8e2ca559 added a |
| 268 | () draft | 283 | () draft |
| 269 | * 6:8f20d4390c21 foo to a | 284 | @ 6:8f20d4390c21 foo to a |
| 270 | | () draft | 285 | | () draft |
| 271 | | * 5:bcb1c47f8520 added d | 286 | | * 5:bcb1c47f8520 added d |
| 272 | | | () draft | 287 | | | () draft |
| 273 | | x 4:86d2603075a3 added c | 288 | | x 4:86d2603075a3 added c |
| 274 | |/ () draft | 289 | |/ () draft |
| 327 | () draft | 342 | () draft |
| 328 | o 8:db3b42ef4da7 added b | 343 | o 8:db3b42ef4da7 added b |
| 329 |/ () draft | 344 |/ () draft |
| 330 @ 7:807e8e2ca559 added a | 345 @ 7:807e8e2ca559 added a |
| 331 | () draft | 346 | () draft |
| 332 | * 6:8f20d4390c21 foo to a | 347 | @ 6:8f20d4390c21 foo to a |
| 333 | | () draft | 348 | | () draft |
| 334 | | * 5:bcb1c47f8520 added d | 349 | | * 5:bcb1c47f8520 added d |
| 335 | | | () draft | 350 | | | () draft |
| 336 | | x 4:86d2603075a3 added c | 351 | | x 4:86d2603075a3 added c |
| 337 | |/ () draft | 352 | |/ () draft |
| 411 | | () draft | 426 | | () draft |
| 412 | o 8:db3b42ef4da7 added b | 427 | o 8:db3b42ef4da7 added b |
| 413 |/ () draft | 428 |/ () draft |
| 414 @ 7:807e8e2ca559 added a | 429 @ 7:807e8e2ca559 added a |
| 415 | () draft | 430 | () draft |
| 416 | * 6:8f20d4390c21 foo to a | 431 | @ 6:8f20d4390c21 foo to a |
| 417 | | () draft | 432 | | () draft |
| 418 | x 1:2f913b0c9220 added a | 433 | x 1:2f913b0c9220 added a |
| 419 |/ () draft | 434 |/ () draft |
| 420 o 0:8fa14d15e168 added hgignore | 435 o 0:8fa14d15e168 added hgignore |
| 421 () draft | 436 () draft |
| 479 $ hg glog | 494 $ hg glog |
| 480 @ 5:c1f4718020e3 added b | 495 @ 5:c1f4718020e3 added b |
| 481 | (bm1) draft | 496 | (bm1) draft |
| 482 o 4:a0086c17bfc7 added a | 497 o 4:a0086c17bfc7 added a |
| 483 | () draft | 498 | () draft |
| 484 | * 3:17509928e5bf added c | 499 | @ 3:17509928e5bf added c |
| 485 | | () draft | 500 | | () draft |
| 486 | x 2:9f0c80a55ddc added b | 501 | x 2:9f0c80a55ddc added b |
| 487 | | () draft | 502 | | () draft |
| 488 | x 1:2f913b0c9220 added a | 503 | x 1:2f913b0c9220 added a |
| 489 |/ () draft | 504 |/ () draft |
| 523 [1] | 538 [1] |
| 524 | 539 |
| 525 $ hg evolve --abort | 540 $ hg evolve --abort |
| 526 evolve aborted | 541 evolve aborted |
| 527 working directory is now at c1f4718020e3 | 542 working directory is now at c1f4718020e3 |
| 543 | |
| 544 $ ls .hg/ | |
| 545 00changelog.i | |
| 546 bookmarks | |
| 547 branch | |
| 548 cache | |
| 549 dirstate | |
| 550 last-message.txt | |
| 551 requires | |
| 552 store | |
| 553 undo.backup.bookmarks | |
| 554 undo.backup.dirstate | |
| 555 undo.bookmarks | |
| 556 undo.branch | |
| 557 undo.desc | |
| 558 undo.dirstate |