--- 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