Mercurial > evolve

comparison tests/test-split.t @ 4455:b58e45aa9be2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: use 'split' instead of 'splitted' in the tests
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Mar 2019 12:53:50 +0100
parents 8ff5e557432a
children 90f94231db5d e4fc3af2d0a9
comparison
equal deleted inserted replaced
4454:f530850c8184 4455:b58e45aa9be2
485 485
486 $ touch SPLIT1 SPLIT2 486 $ touch SPLIT1 SPLIT2
487 $ hg add SPLIT1 SPLIT2 487 $ hg add SPLIT1 SPLIT2
488 $ hg branch another-branch 488 $ hg branch another-branch
489 marked working directory as branch another-branch 489 marked working directory as branch another-branch
490 $ hg commit -m "To be splitted" 490 $ hg commit -m "To be split"
491 $ hg log -G -l 3 491 $ hg log -G -l 3
492 @ changeset: 21:8dad923bdb9b 492 @ changeset: 21:b6bf93dd314b
493 | branch: another-branch 493 | branch: another-branch
494 | tag: tip 494 | tag: tip
495 | topic: mytopic 495 | topic: mytopic
496 | user: test 496 | user: test
497 | date: Thu Jan 01 00:00:00 1970 +0000 497 | date: Thu Jan 01 00:00:00 1970 +0000
498 | summary: To be splitted 498 | summary: To be split
499 | 499 |
500 o changeset: 20:2532b288af61 500 o changeset: 20:2532b288af61
501 | branch: new-branch 501 | branch: new-branch
502 | topic: mytopic 502 | topic: mytopic
503 | user: test 503 | user: test
516 # HG changeset patch 516 # HG changeset patch
517 # User test 517 # User test
518 # Date 0 0 518 # Date 0 0
519 # Thu Jan 01 00:00:00 1970 +0000 519 # Thu Jan 01 00:00:00 1970 +0000
520 # Branch another-branch 520 # Branch another-branch
521 # Node ID 8dad923bdb9bb3b99291caa5baeb03bbc30dfd33 521 # Node ID b6bf93dd314ba47b838befc7488b2223981684ea
522 # Parent 2532b288af61bd19239a95ae2a3ecb9b0ad4b8e1 522 # Parent 2532b288af61bd19239a95ae2a3ecb9b0ad4b8e1
523 # EXP-Topic mytopic 523 # EXP-Topic mytopic
524 To be splitted 524 To be split
525 525
526 diff --git a/SPLIT1 b/SPLIT1 526 diff --git a/SPLIT1 b/SPLIT1
527 new file mode 100644 527 new file mode 100644
528 diff --git a/SPLIT2 b/SPLIT2 528 diff --git a/SPLIT2 b/SPLIT2
529 new file mode 100644 529 new file mode 100644
550 new file mode 100644 550 new file mode 100644
551 examine changes to 'SPLIT2'? [Ynesfdaq?] Y 551 examine changes to 'SPLIT2'? [Ynesfdaq?] Y
552 552
553 no more change to split 553 no more change to split
554 554
555 The splitted changesets should be on the 'another-branch' 555 The split changesets should be on the 'another-branch'
556 $ hg log -G -l 3 556 $ hg log -G -l 3
557 @ changeset: 23:56a59faa8af7 557 @ changeset: 23:56a59faa8af7
558 | branch: another-branch 558 | branch: another-branch
559 | tag: tip 559 | tag: tip
560 | topic: mytopic 560 | topic: mytopic
582 582
583 $ hg branch yet-another-branch 583 $ hg branch yet-another-branch
584 marked working directory as branch yet-another-branch 584 marked working directory as branch yet-another-branch
585 $ touch SPLIT3 SPLIT4 585 $ touch SPLIT3 SPLIT4
586 $ hg add SPLIT3 SPLIT4 586 $ hg add SPLIT3 SPLIT4
587 $ hg commit -m "To be splitted again" 587 $ hg commit -m "To be split again"
588 588
589 $ hg up "tip~1" 589 $ hg up "tip~1"
590 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 590 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
591 591
592 $ hg log -G -l 2 592 $ hg log -G -l 2
593 o changeset: 24:b1020d17c364 593 o changeset: 24:9f56497dbac1
594 | branch: yet-another-branch 594 | branch: yet-another-branch
595 | tag: tip 595 | tag: tip
596 | topic: mytopic 596 | topic: mytopic
597 | user: test 597 | user: test
598 | date: Thu Jan 01 00:00:00 1970 +0000 598 | date: Thu Jan 01 00:00:00 1970 +0000
599 | summary: To be splitted again 599 | summary: To be split again
600 | 600 |
601 @ changeset: 23:56a59faa8af7 601 @ changeset: 23:56a59faa8af7
602 | branch: another-branch 602 | branch: another-branch
603 ~ topic: mytopic 603 ~ topic: mytopic
604 user: test 604 user: test
628 628
629 $ hg branch 629 $ hg branch
630 another-branch 630 another-branch
631 631
632 $ hg log -G -l 2 632 $ hg log -G -l 2
633 o changeset: 24:b1020d17c364 633 o changeset: 24:9f56497dbac1
634 | branch: yet-another-branch 634 | branch: yet-another-branch
635 | tag: tip 635 | tag: tip
636 | topic: mytopic 636 | topic: mytopic
637 | user: test 637 | user: test
638 | date: Thu Jan 01 00:00:00 1970 +0000 638 | date: Thu Jan 01 00:00:00 1970 +0000
639 | summary: To be splitted again 639 | summary: To be split again
640 | 640 |
641 @ changeset: 23:56a59faa8af7 641 @ changeset: 23:56a59faa8af7
642 | branch: another-branch 642 | branch: another-branch
643 ~ topic: mytopic 643 ~ topic: mytopic
644 user: test 644 user: test