av6 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12589 AFFECTED FILES tests/test-push-checkheads-partial-C1.t tests/test-push-checkheads-partial-C2.t tests/test-push-checkheads-pruned-B2.t tests/test-push-checkheads-pruned-B3.t tests/test-push-checkheads-pruned-B5.t tests/test-push-checkheads-pruned-B8.t tests/test-push-checkheads-superceed-A1.t tests/test-push-checkheads-superceed-A2.t tests/test-push-checkheads-superceed-A3.t tests/test-push-checkheads-superceed-A4.t tests/test-push-checkheads-superceed-A5.t tests/test-push-checkheads-superceed-A6.t tests/test-push-checkheads-superceed-A7.t tests/test-push-checkheads-superceed-A8.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t CHANGE DETAILS diff --git a/tests/test-push-checkheads-unpushed-D5.t b/tests/test-push-checkheads-unpushed-D5.t --- 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-push-checkheads-unpushed-D4.t b/tests/test-push-checkheads-unpushed-D4.t --- 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-superceed-A8.t b/tests/test-push-checkheads-superceed-A8.t --- a/tests/test-push-checkheads-superceed-A8.t +++ b/tests/test-push-checkheads-superceed-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-superceed-A7.t b/tests/test-push-checkheads-superceed-A7.t --- a/tests/test-push-checkheads-superceed-A7.t +++ b/tests/test-push-checkheads-superceed-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-A6.t b/tests/test-push-checkheads-superceed-A6.t --- a/tests/test-push-checkheads-superceed-A6.t +++ b/tests/test-push-checkheads-superceed-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-A5.t b/tests/test-push-checkheads-superceed-A5.t --- a/tests/test-push-checkheads-superceed-A5.t +++ b/tests/test-push-checkheads-superceed-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-A4.t b/tests/test-push-checkheads-superceed-A4.t --- a/tests/test-push-checkheads-superceed-A4.t +++ b/tests/test-push-checkheads-superceed-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-A3.t b/tests/test-push-checkheads-superceed-A3.t --- a/tests/test-push-checkheads-superceed-A3.t +++ b/tests/test-push-checkheads-superceed-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-A2.t b/tests/test-push-checkheads-superceed-A2.t --- a/tests/test-push-checkheads-superceed-A2.t +++ b/tests/test-push-checkheads-superceed-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-A1.t b/tests/test-push-checkheads-superceed-A1.t --- a/tests/test-push-checkheads-superceed-A1.t +++ b/tests/test-push-checkheads-superceed-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-pruned-B8.t b/tests/test-push-checkheads-pruned-B8.t --- 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-pruned-B5.t b/tests/test-push-checkheads-pruned-B5.t --- 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-B3.t b/tests/test-push-checkheads-pruned-B3.t --- 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-B2.t b/tests/test-push-checkheads-pruned-B2.t --- 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-partial-C2.t b/tests/test-push-checkheads-partial-C2.t --- 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-partial-C1.t b/tests/test-push-checkheads-partial-C1.t --- 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: To: av6, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
