diff --git a/tests/test-push-checkheads-partial-C1.t b/tests/test-push-checkheads-partial-C1.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcGFydGlhbC1DMS50..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcGFydGlhbC1DMS50 100644 --- a/tests/test-push-checkheads-partial-C1.t +++ b/tests/test-push-checkheads-partial-C1.t @@ -17,7 +17,7 @@ .. .. new-state: .. -.. * 1 new changesets branches superceeding only the head of the old one +.. * 1 new changesets branches superseding only the head of the old one .. * base of the old branch is still alive .. .. expected-result: diff --git a/tests/test-push-checkheads-partial-C2.t b/tests/test-push-checkheads-partial-C2.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcGFydGlhbC1DMi50..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcGFydGlhbC1DMi50 100644 --- a/tests/test-push-checkheads-partial-C2.t +++ b/tests/test-push-checkheads-partial-C2.t @@ -17,7 +17,7 @@ .. .. new-state: .. -.. * 1 new changesets branches superceeding only the base of the old one +.. * 1 new changesets branches superseding only the base of the old one .. * The old branch is still alive (base is obsolete, head is alive) .. .. expected-result: diff --git a/tests/test-push-checkheads-pruned-B2.t b/tests/test-push-checkheads-pruned-B2.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUIyLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUIyLnQ= 100644 --- a/tests/test-push-checkheads-pruned-B2.t +++ b/tests/test-push-checkheads-pruned-B2.t @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets -TestCase 2: multi-changeset branch, head is pruned, rest is superceeded +TestCase 2: multi-changeset branch, head is pruned, rest is superseded .. old-state: .. diff --git a/tests/test-push-checkheads-pruned-B3.t b/tests/test-push-checkheads-pruned-B3.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUIzLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUIzLnQ= 100644 --- a/tests/test-push-checkheads-pruned-B3.t +++ b/tests/test-push-checkheads-pruned-B3.t @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets -TestCase 3: multi-changeset branch, other is pruned, rest is superceeded +TestCase 3: multi-changeset branch, other is pruned, rest is superseded .. old-state: .. @@ -17,7 +17,7 @@ .. .. new-state: .. -.. * old head is superceeded +.. * old head is superseded .. * old other is pruned .. .. expected-result: diff --git a/tests/test-push-checkheads-pruned-B5.t b/tests/test-push-checkheads-pruned-B5.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUI1LnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUI1LnQ= 100644 --- a/tests/test-push-checkheads-pruned-B5.t +++ b/tests/test-push-checkheads-pruned-B5.t @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets -TestCase 5: multi-changeset branch, mix of pruned and superceeded +TestCase 5: multi-changeset branch, mix of pruned and superseded .. old-state: .. @@ -18,7 +18,7 @@ .. new-state: .. .. * old head is pruned -.. * old mid is superceeded +.. * old mid is superseded .. * old root is pruned .. .. expected-result: diff --git a/tests/test-push-checkheads-pruned-B8.t b/tests/test-push-checkheads-pruned-B8.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUI4LnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtcHJ1bmVkLUI4LnQ= 100644 --- a/tests/test-push-checkheads-pruned-B8.t +++ b/tests/test-push-checkheads-pruned-B8.t @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets -TestCase 2: multi-changeset branch, head is pruned, rest is superceeded, through other +TestCase 2: multi-changeset branch, head is pruned, rest is superseded, through other .. old-state: .. diff --git a/tests/test-push-checkheads-superceed-A1.t b/tests/test-push-checkheads-supersede-A1.t similarity index 95% rename from tests/test-push-checkheads-superceed-A1.t rename to tests/test-push-checkheads-supersede-A1.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUExLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUExLnQ= 100644 --- a/tests/test-push-checkheads-superceed-A1.t +++ b/tests/test-push-checkheads-supersede-A1.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 1: single-changeset branch .. old-state: diff --git a/tests/test-push-checkheads-superceed-A2.t b/tests/test-push-checkheads-supersede-A2.t similarity index 96% rename from tests/test-push-checkheads-superceed-A2.t rename to tests/test-push-checkheads-supersede-A2.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUEyLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUEyLnQ= 100644 --- a/tests/test-push-checkheads-superceed-A2.t +++ b/tests/test-push-checkheads-supersede-A2.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 2: multi-changeset branch .. old-state: diff --git a/tests/test-push-checkheads-superceed-A3.t b/tests/test-push-checkheads-supersede-A3.t similarity index 96% rename from tests/test-push-checkheads-superceed-A3.t rename to tests/test-push-checkheads-supersede-A3.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUEzLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUEzLnQ= 100644 --- a/tests/test-push-checkheads-superceed-A3.t +++ b/tests/test-push-checkheads-supersede-A3.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 3: multi-changeset branch with reordering Push should be allowed diff --git a/tests/test-push-checkheads-superceed-A4.t b/tests/test-push-checkheads-supersede-A4.t similarity index 95% rename from tests/test-push-checkheads-superceed-A4.t rename to tests/test-push-checkheads-supersede-A4.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUE0LnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUE0LnQ= 100644 --- a/tests/test-push-checkheads-superceed-A4.t +++ b/tests/test-push-checkheads-supersede-A4.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 4: New changeset as children of the successor .. old-state: diff --git a/tests/test-push-checkheads-superceed-A5.t b/tests/test-push-checkheads-supersede-A5.t similarity index 95% rename from tests/test-push-checkheads-superceed-A5.t rename to tests/test-push-checkheads-supersede-A5.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUE1LnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUE1LnQ= 100644 --- a/tests/test-push-checkheads-superceed-A5.t +++ b/tests/test-push-checkheads-supersede-A5.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 5: New changeset as parent of the successor .. old-state: diff --git a/tests/test-push-checkheads-superceed-A6.t b/tests/test-push-checkheads-supersede-A6.t similarity index 91% rename from tests/test-push-checkheads-superceed-A6.t rename to tests/test-push-checkheads-supersede-A6.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUE2LnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUE2LnQ= 100644 --- a/tests/test-push-checkheads-superceed-A6.t +++ b/tests/test-push-checkheads-supersede-A6.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch), same number of head .. old-state: @@ -17,8 +17,8 @@ .. .. new-state: .. -.. * 1 new branch superceeding the base of the old-2-changesets-branch, -.. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other +.. * 1 new branch superseding the base of the old-2-changesets-branch, +.. * 1 new changesets on the old-1-changeset-branch superseding the head of the other .. .. expected-result: .. diff --git a/tests/test-push-checkheads-superceed-A7.t b/tests/test-push-checkheads-supersede-A7.t similarity index 91% rename from tests/test-push-checkheads-superceed-A7.t rename to tests/test-push-checkheads-supersede-A7.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUE3LnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUE3LnQ= 100644 --- a/tests/test-push-checkheads-superceed-A7.t +++ b/tests/test-push-checkheads-supersede-A7.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head .. old-state: @@ -17,8 +17,8 @@ .. .. new-state: .. -.. * 1 new branch superceeding the head of the old-2-changesets-branch, -.. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other +.. * 1 new branch superseding the head of the old-2-changesets-branch, +.. * 1 new changesets on the old-1-changeset-branch superseding the base of the other .. .. expected-result: .. diff --git a/tests/test-push-checkheads-superceed-A8.t b/tests/test-push-checkheads-supersede-A8.t similarity index 96% rename from tests/test-push-checkheads-superceed-A8.t rename to tests/test-push-checkheads-supersede-A8.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJjZWVkLUE4LnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtc3VwZXJzZWRlLUE4LnQ= 100644 --- a/tests/test-push-checkheads-superceed-A8.t +++ b/tests/test-push-checkheads-supersede-A8.t @@ -8,7 +8,7 @@ This case is part of a series of tests checking this behavior. -Category A: simple case involving a branch being superceeded by another. +Category A: simple case involving a branch being superseded by another. TestCase 8: single-changeset branch indirect rewrite .. old-state: diff --git a/tests/test-push-checkheads-unpushed-D4.t b/tests/test-push-checkheads-unpushed-D4.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtdW5wdXNoZWQtRDQudA==..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtdW5wdXNoZWQtRDQudA== 100644 --- a/tests/test-push-checkheads-unpushed-D4.t +++ b/tests/test-push-checkheads-unpushed-D4.t @@ -17,8 +17,8 @@ .. .. new-state: .. -.. * 1 new branch superceeding the base of the old-2-changesets-branch, -.. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other +.. * 1 new branch superseding the base of the old-2-changesets-branch, +.. * 1 new changesets on the old-1-changeset-branch superseding the head of the other .. .. expected-result: .. diff --git a/tests/test-push-checkheads-unpushed-D5.t b/tests/test-push-checkheads-unpushed-D5.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtdW5wdXNoZWQtRDUudA==..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1wdXNoLWNoZWNraGVhZHMtdW5wdXNoZWQtRDUudA== 100644 --- a/tests/test-push-checkheads-unpushed-D5.t +++ b/tests/test-push-checkheads-unpushed-D5.t @@ -17,8 +17,8 @@ .. .. new-state: .. -.. * 1 new branch superceeding the head of the old-2-changesets-branch, -.. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other +.. * 1 new branch superseding the head of the old-2-changesets-branch, +.. * 1 new changesets on the old-1-changeset-branch superseding the base of the other .. .. expected-result: .. diff --git a/tests/test-single-head-obsolescence-named-branch-A1.t b/tests/test-single-head-obsolescence-named-branch-A1.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtbmFtZWQtYnJhbmNoLUExLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtbmFtZWQtYnJhbmNoLUExLnQ= 100644 --- a/tests/test-single-head-obsolescence-named-branch-A1.t +++ b/tests/test-single-head-obsolescence-named-branch-A1.t @@ -20,7 +20,7 @@ .. new-state: .. .. * 2 changeset changeset on branch Z at the same location -.. * 2 changeset changeset on branch default superceeding the other ones +.. * 2 changeset changeset on branch default superseding the other ones .. .. expected-result: .. diff --git a/tests/test-single-head-obsolescence-named-branch-A2.t b/tests/test-single-head-obsolescence-named-branch-A2.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtbmFtZWQtYnJhbmNoLUEyLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtbmFtZWQtYnJhbmNoLUEyLnQ= 100644 --- a/tests/test-single-head-obsolescence-named-branch-A2.t +++ b/tests/test-single-head-obsolescence-named-branch-A2.t @@ -22,7 +22,7 @@ .. .. * 2 changeset changeset on branch Z at the same location .. * 1 changeset changeset on branch default unchanged -.. * 1 changeset changeset on branch default superceeding the other ones +.. * 1 changeset changeset on branch default superseding the other ones .. .. expected-result: .. diff --git a/tests/test-single-head-obsolescence-named-branch-A3.t b/tests/test-single-head-obsolescence-named-branch-A3.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtbmFtZWQtYnJhbmNoLUEzLnQ=..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtbmFtZWQtYnJhbmNoLUEzLnQ= 100644 --- a/tests/test-single-head-obsolescence-named-branch-A3.t +++ b/tests/test-single-head-obsolescence-named-branch-A3.t @@ -10,7 +10,7 @@ This case is part of a series of tests checking this behavior. Category A: Involving obsolescence -TestCase 3: Full superceedig of a branch interleaved with another +TestCase 3: Full supersedig of a branch interleaved with another .. old-state: .. @@ -20,7 +20,7 @@ .. new-state: .. .. * 2 changeset changeset on branch Z at the same location -.. * 2 changeset changeset on branch default superceeding the other ones +.. * 2 changeset changeset on branch default superseding the other ones .. .. expected-result: .. diff --git a/tests/test-single-head-obsolescence-topic-B1.t b/tests/test-single-head-obsolescence-topic-B1.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtdG9waWMtQjEudA==..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtdG9waWMtQjEudA== 100644 --- a/tests/test-single-head-obsolescence-topic-B1.t +++ b/tests/test-single-head-obsolescence-topic-B1.t @@ -20,7 +20,7 @@ .. new-state: .. .. * 2 changeset changeset on topic Y at the same location -.. * 2 changeset changeset on topic X superceeding the other ones +.. * 2 changeset changeset on topic X superseding the other ones .. .. expected-result: .. diff --git a/tests/test-single-head-obsolescence-topic-B2.t b/tests/test-single-head-obsolescence-topic-B2.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtdG9waWMtQjIudA==..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtdG9waWMtQjIudA== 100644 --- a/tests/test-single-head-obsolescence-topic-B2.t +++ b/tests/test-single-head-obsolescence-topic-B2.t @@ -22,7 +22,7 @@ .. .. * 2 changeset changeset on topic Y at the same location .. * 1 changeset changeset on topic X unchanged -.. * 1 changeset changeset on topic X superceeding the other ones +.. * 1 changeset changeset on topic X superseding the other ones .. .. expected-result: .. diff --git a/tests/test-single-head-obsolescence-topic-B3.t b/tests/test-single-head-obsolescence-topic-B3.t index 182e2a1dbd1c822d42febcb4cc4f2b4a29ced36d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtdG9waWMtQjMudA==..144d10e7475782dd8b0b094f373cae17767b343d_dGVzdHMvdGVzdC1zaW5nbGUtaGVhZC1vYnNvbGVzY2VuY2UtdG9waWMtQjMudA== 100644 --- a/tests/test-single-head-obsolescence-topic-B3.t +++ b/tests/test-single-head-obsolescence-topic-B3.t @@ -10,7 +10,7 @@ This case is part of a series of tests checking this behavior. Category B: Involving obsolescence with topic -TestCase 3: Full superceedig of a branch interleaved with another +TestCase 3: Full supersedig of a branch interleaved with another .. old-state: .. @@ -20,7 +20,7 @@ .. new-state: .. .. * 2 changeset changeset on topic X at the same location -.. * 2 changeset changeset on topic Y superceeding the other ones +.. * 2 changeset changeset on topic Y superseding the other ones .. .. expected-result: ..