Mercurial > evolve
comparison tests/test-split.t @ 3270:e6150b9b88d9 stable
split: force the branch to fix the split bug
Also restore it after the split
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Sun, 10 Dec 2017 21:44:10 +0100 |
| parents | e6b980687311 |
| children | c0ee9ddfd5ff 2e703ed1c713 |
comparison
equal
deleted
inserted
replaced
| 3269:e6b980687311 | 3270:e6150b9b88d9 |
|---|---|
| 558 | 558 |
| 559 no more change to split | 559 no more change to split |
| 560 | 560 |
| 561 The splitted changesets should be on the 'another-branch' | 561 The splitted changesets should be on the 'another-branch' |
| 562 $ hg log -G -l 3 | 562 $ hg log -G -l 3 |
| 563 @ changeset: 23:4e2e9dee1bcc | 563 @ changeset: 23:56a59faa8af7 |
| 564 | branch: new-branch | 564 | branch: another-branch |
| 565 | tag: tip | 565 | tag: tip |
| 566 | topic: mytopic | 566 | topic: mytopic |
| 567 | user: test | 567 | user: test |
| 568 | date: Thu Jan 01 00:00:00 1970 +0000 | 568 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 569 | summary: split10 | 569 | summary: split10 |
| 570 | | 570 | |
| 571 o changeset: 22:8c18390f1ccc | 571 o changeset: 22:75695e3e2300 |
| 572 | branch: new-branch | 572 | branch: another-branch |
| 573 | topic: mytopic | 573 | topic: mytopic |
| 574 | parent: 20:2532b288af61 | 574 | parent: 20:2532b288af61 |
| 575 | user: test | 575 | user: test |
| 576 | date: Thu Jan 01 00:00:00 1970 +0000 | 576 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 577 | summary: split9 | 577 | summary: split9 |
| 594 | 594 |
| 595 $ hg up "tip~1" | 595 $ hg up "tip~1" |
| 596 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 596 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 597 | 597 |
| 598 $ hg log -G -l 2 | 598 $ hg log -G -l 2 |
| 599 o changeset: 24:0207fa6107a1 | 599 o changeset: 24:b1020d17c364 |
| 600 | branch: yet-another-branch | 600 | branch: yet-another-branch |
| 601 | tag: tip | 601 | tag: tip |
| 602 | topic: mytopic | 602 | topic: mytopic |
| 603 | user: test | 603 | user: test |
| 604 | date: Thu Jan 01 00:00:00 1970 +0000 | 604 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 605 | summary: To be splitted again | 605 | summary: To be splitted again |
| 606 | | 606 | |
| 607 @ changeset: 23:4e2e9dee1bcc | 607 @ changeset: 23:56a59faa8af7 |
| 608 | branch: new-branch | 608 | branch: another-branch |
| 609 ~ topic: mytopic | 609 ~ topic: mytopic |
| 610 user: test | 610 user: test |
| 611 date: Thu Jan 01 00:00:00 1970 +0000 | 611 date: Thu Jan 01 00:00:00 1970 +0000 |
| 612 summary: split10 | 612 summary: split10 |
| 613 | 613 |
| 614 $ hg branch | 614 $ hg branch |
| 615 new-branch | 615 another-branch |
| 616 | 616 |
| 617 $ hg split -r tip << EOF | 617 $ hg split -r tip << EOF |
| 618 > Y | 618 > Y |
| 619 > q | 619 > q |
| 620 > EOF | 620 > EOF |
| 631 | 631 |
| 632 abort: user quit | 632 abort: user quit |
| 633 [255] | 633 [255] |
| 634 | 634 |
| 635 $ hg branch | 635 $ hg branch |
| 636 new-branch | 636 another-branch |
| 637 | 637 |
| 638 $ hg log -G -l 2 | 638 $ hg log -G -l 2 |
| 639 o changeset: 24:0207fa6107a1 | 639 o changeset: 24:b1020d17c364 |
| 640 | branch: yet-another-branch | 640 | branch: yet-another-branch |
| 641 | tag: tip | 641 | tag: tip |
| 642 | topic: mytopic | 642 | topic: mytopic |
| 643 | user: test | 643 | user: test |
| 644 | date: Thu Jan 01 00:00:00 1970 +0000 | 644 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 645 | summary: To be splitted again | 645 | summary: To be splitted again |
| 646 | | 646 | |
| 647 @ changeset: 23:4e2e9dee1bcc | 647 @ changeset: 23:56a59faa8af7 |
| 648 | branch: new-branch | 648 | branch: another-branch |
| 649 ~ topic: mytopic | 649 ~ topic: mytopic |
| 650 user: test | 650 user: test |
| 651 date: Thu Jan 01 00:00:00 1970 +0000 | 651 date: Thu Jan 01 00:00:00 1970 +0000 |
| 652 summary: split10 | 652 summary: split10 |
| 653 | 653 |