# HG changeset patch # User Pierre-Yves David # Date 1553601230 -3600 # Node ID b58e45aa9be2c77447f20fdd3a689b7fa6eab717 # Parent f530850c818412fabab6617443abcce431e6b5b5 test: use 'split' instead of 'splitted' in the tests diff -r f530850c8184 -r b58e45aa9be2 tests/test-evolve-obshistory-lots-of-splits.t --- a/tests/test-evolve-obshistory-lots-of-splits.t Tue Mar 26 12:30:10 2019 +0100 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Tue Mar 26 12:53:50 2019 +0100 @@ -6,8 +6,8 @@ $ . $TESTDIR/testlib/obshistory_setup.sh -Test output with lots of splitted commit -======================================== +Test output with lots of split commit +===================================== Test setup ---------- diff -r f530850c8184 -r b58e45aa9be2 tests/test-evolve-obshistory-split.t --- a/tests/test-evolve-obshistory-split.t Tue Mar 26 12:30:10 2019 +0100 +++ b/tests/test-evolve-obshistory-split.t Tue Mar 26 12:53:50 2019 +0100 @@ -6,8 +6,8 @@ $ . $TESTDIR/testlib/obshistory_setup.sh -Test output with splitted commit -================================ +Test output with split commit +============================= Test setup ---------- @@ -98,7 +98,7 @@ Check output on the client side ------------------------------- -Check that debugobshistory on splitted commit show both targets +Check that debugobshistory on split commit show both targets $ hg obslog 471597cad322 --hidden --patch x 471597cad322 (1) A0 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) @@ -134,7 +134,7 @@ } ] Check that debugobshistory on the first successor after split show -the revision plus the splitted one +the revision plus the split one $ hg obslog 337fec4d2edc --patch o 337fec4d2edc (2) A0 | @@ -155,7 +155,7 @@ (No patch available, too many successors (2)) Check that debugobshistory on the second successor after split show -the revision plus the splitted one +the revision plus the split one $ hg obslog f257fde29c7a --patch @ f257fde29c7a (3) A0 | @@ -175,7 +175,7 @@ note: testing split (No patch available, too many successors (2)) -Obslog with all option all should also works on the splitted commit +Obslog with all option all should also works on the split commit $ hg obslog -a 471597cad322 --hidden --patch o 337fec4d2edc (2) A0 | diff -r f530850c8184 -r b58e45aa9be2 tests/test-evolve-order.t --- a/tests/test-evolve-order.t Tue Mar 26 12:30:10 2019 +0100 +++ b/tests/test-evolve-order.t Tue Mar 26 12:53:50 2019 +0100 @@ -231,8 +231,8 @@ | ~ -Test multiple revision with some un-evolvable because parent is splitted ------------------------------------------------------------------------- +Test multiple revision with some un-evolvable because parent is split +--------------------------------------------------------------------- $ hg up 'desc(c2prime)' 0 files updated, 0 files merged, 2 files removed, 0 files unresolved diff -r f530850c8184 -r b58e45aa9be2 tests/test-evolve-orphan-split.t --- a/tests/test-evolve-orphan-split.t Tue Mar 26 12:30:10 2019 +0100 +++ b/tests/test-evolve-orphan-split.t Tue Mar 26 12:53:50 2019 +0100 @@ -19,8 +19,8 @@ $ hg add .hgignore $ hg ci -m "added hgignore" -An orphan changeset with parent got splitted --------------------------------------------- +An orphan changeset with parent got split +----------------------------------------- $ for ch in a b c; do echo foo > $ch; done; diff -r f530850c8184 -r b58e45aa9be2 tests/test-evolve-phase-divergence.t --- a/tests/test-evolve-phase-divergence.t Tue Mar 26 12:30:10 2019 +0100 +++ b/tests/test-evolve-phase-divergence.t Tue Mar 26 12:53:50 2019 +0100 @@ -927,8 +927,8 @@ | () public ~ -When the public changesets is splitted causing phase-divergence ---------------------------------------------------------------- +When the public changesets is split causing phase-divergence +------------------------------------------------------------ $ cd ../split @@ -1040,8 +1040,8 @@ @@ -1,1 +0,0 @@ -n -When the public changeset is splitted across various branches --------------------------------------------------------------- +When the public changeset is split across various branches +---------------------------------------------------------- $ cd ../split-across-branches diff -r f530850c8184 -r b58e45aa9be2 tests/test-evolve-templates.t --- a/tests/test-evolve-templates.t Tue Mar 26 12:30:10 2019 +0100 +++ b/tests/test-evolve-templates.t Tue Mar 26 12:53:50 2019 +0100 @@ -245,8 +245,8 @@ o ea207398892e -Test templates with splitted commit -=================================== +Test templates with split commit +================================ $ hg init $TESTTMP/templates-local-split $ cd $TESTTMP/templates-local-split @@ -1313,7 +1313,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: ROOT -Diverge one of the splitted commit +Diverge one of the split commit $ hg up 6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r f530850c8184 -r b58e45aa9be2 tests/test-split.t --- a/tests/test-split.t Tue Mar 26 12:30:10 2019 +0100 +++ b/tests/test-split.t Tue Mar 26 12:53:50 2019 +0100 @@ -487,15 +487,15 @@ $ hg add SPLIT1 SPLIT2 $ hg branch another-branch marked working directory as branch another-branch - $ hg commit -m "To be splitted" + $ hg commit -m "To be split" $ hg log -G -l 3 - @ changeset: 21:8dad923bdb9b + @ changeset: 21:b6bf93dd314b | branch: another-branch | tag: tip | topic: mytopic | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | summary: To be splitted + | summary: To be split | o changeset: 20:2532b288af61 | branch: new-branch @@ -518,10 +518,10 @@ # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Branch another-branch - # Node ID 8dad923bdb9bb3b99291caa5baeb03bbc30dfd33 + # Node ID b6bf93dd314ba47b838befc7488b2223981684ea # Parent 2532b288af61bd19239a95ae2a3ecb9b0ad4b8e1 # EXP-Topic mytopic - To be splitted + To be split diff --git a/SPLIT1 b/SPLIT1 new file mode 100644 @@ -552,7 +552,7 @@ no more change to split -The splitted changesets should be on the 'another-branch' +The split changesets should be on the 'another-branch' $ hg log -G -l 3 @ changeset: 23:56a59faa8af7 | branch: another-branch @@ -584,19 +584,19 @@ marked working directory as branch yet-another-branch $ touch SPLIT3 SPLIT4 $ hg add SPLIT3 SPLIT4 - $ hg commit -m "To be splitted again" + $ hg commit -m "To be split again" $ hg up "tip~1" 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg log -G -l 2 - o changeset: 24:b1020d17c364 + o changeset: 24:9f56497dbac1 | branch: yet-another-branch | tag: tip | topic: mytopic | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | summary: To be splitted again + | summary: To be split again | @ changeset: 23:56a59faa8af7 | branch: another-branch @@ -630,13 +630,13 @@ another-branch $ hg log -G -l 2 - o changeset: 24:b1020d17c364 + o changeset: 24:9f56497dbac1 | branch: yet-another-branch | tag: tip | topic: mytopic | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | summary: To be splitted again + | summary: To be split again | @ changeset: 23:56a59faa8af7 | branch: another-branch