Mercurial > evolve

changeset 6034:144d10e74757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: s/superceed/supersede/g
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 10 Sep 2021 16:02:20 +0300
parents 182e2a1dbd1c
children 55fbf9c8bfe0
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-supersede-A1.t tests/test-push-checkheads-supersede-A2.t tests/test-push-checkheads-supersede-A3.t tests/test-push-checkheads-supersede-A4.t tests/test-push-checkheads-supersede-A5.t tests/test-push-checkheads-supersede-A6.t tests/test-push-checkheads-supersede-A7.t tests/test-push-checkheads-supersede-A8.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t tests/test-single-head-obsolescence-named-branch-A1.t tests/test-single-head-obsolescence-named-branch-A2.t tests/test-single-head-obsolescence-named-branch-A3.t tests/test-single-head-obsolescence-topic-B1.t tests/test-single-head-obsolescence-topic-B2.t tests/test-single-head-obsolescence-topic-B3.t
diffstat 30 files changed, 732 insertions(+), 732 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-push-checkheads-partial-C1.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-partial-C1.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
--- a/tests/test-push-checkheads-partial-C2.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-partial-C2.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
--- a/tests/test-push-checkheads-pruned-B2.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-pruned-B2.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-push-checkheads-pruned-B3.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-pruned-B3.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
--- a/tests/test-push-checkheads-pruned-B5.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-pruned-B5.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
--- a/tests/test-push-checkheads-pruned-B8.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-pruned-B8.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-push-checkheads-superceed-A1.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-====================================
-Testing head checking code: Case A-1
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 1: single-changeset branch
-
-.. old-state:
-..
-.. * 1 changeset branch
-..
-.. new-state:
-..
-.. * 1 changeset branch succeeding to A
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..   A ø⇠◔ A'
-..     |/
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A1
-  $ cd A1
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd client
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit A1
-  created new head
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg log -G --hidden
-  @  f6082bc4ffef (draft): A1
-  |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A1/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
-  1 new obsolescence markers
-  obsoleted 1 changesets
-
-  $ cd ../..
--- a/tests/test-push-checkheads-superceed-A2.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-====================================
-Testing head checking code: Case A-2
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 2: multi-changeset branch
-
-.. old-state:
-..
-.. * 1 branch with 2 changesets
-..
-.. new-state:
-..
-.. * another 2-changeset branch succeeding the old one
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..   B ø⇠◔ B'
-..     | |
-..   A ø⇠◔ A'
-..     |/
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A2
-  $ cd A2
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd server
-  $ mkcommit B0
-  $ cd ../client
-  $ hg pull
-  pulling from $TESTTMP/A2/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533 (1 drafts)
-  (run 'hg update' to get a working copy)
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit A1
-  created new head
-  $ mkcommit B1
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  1 new orphan changesets
-  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg log -G --hidden
-  @  262c8c798096 (draft): B1
-  |
-  o  f6082bc4ffef (draft): A1
-  |
-  | x  d73caddc5533 (draft): B0
-  | |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A2/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  2 new obsolescence markers
-  obsoleted 2 changesets
-
-  $ cd ../..
--- a/tests/test-push-checkheads-superceed-A3.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-====================================
-Testing head checking code: Case A-3
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 3: multi-changeset branch with reordering
-
-Push should be allowed
-.. old-state:
-..
-.. * 2 changeset branch
-..
-.. new-state:
-..
-.. * 2 changeset branch succeeding the old one with reordering
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..   B ø⇠⇠
-..     | ⇡
-..   A ø⇠⇠⇠○ A'
-..     | ⇡/
-..     | ○ B'
-..     |/
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A3
-  $ cd A3
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd server
-  $ mkcommit B0
-  $ cd ../client
-  $ hg pull
-  pulling from $TESTTMP/A3/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533 (1 drafts)
-  (run 'hg update' to get a working copy)
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit B1
-  created new head
-  $ mkcommit A1
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  1 new orphan changesets
-  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg log -G --hidden
-  @  c1c7524e9488 (draft): A1
-  |
-  o  25c56d33e4c4 (draft): B1
-  |
-  | x  d73caddc5533 (draft): B0
-  | |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A3/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  2 new obsolescence markers
-  obsoleted 2 changesets
-
-  $ cd ../..
--- a/tests/test-push-checkheads-superceed-A4.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-====================================
-Testing head checking code: Case A-4
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 4: New changeset as children of the successor
-
-.. old-state:
-..
-.. * 1-changeset branch
-..
-.. new-state:
-..
-.. * 2-changeset branch, first is a successor, but head is new
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..       ◔ B
-..       |
-..   A ø⇠◔ A'
-..     |/
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A4
-  $ cd A4
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd client
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit A1
-  created new head
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ mkcommit B0
-  $ hg log -G --hidden
-  @  f40ded968333 (draft): B0
-  |
-  o  f6082bc4ffef (draft): A1
-  |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A4/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  1 new obsolescence markers
-  obsoleted 1 changesets
-
-  $ cd ../../
--- a/tests/test-push-checkheads-superceed-A5.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-====================================
-Testing head checking code: Case A-5
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 5: New changeset as parent of the successor
-
-.. old-state:
-..
-.. * 1-changeset branch
-..
-.. new-state:
-..
-.. * 2rchangeset branch, head is a successor, but other is new
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..   A ø⇠◔ A'
-..     | |
-..     | ◔ B
-..     |/
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A5
-  $ cd A5
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd client
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit B0
-  created new head
-  $ mkcommit A1
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg log -G --hidden
-  @  ba93660aff8d (draft): A1
-  |
-  o  74ff5441d343 (draft): B0
-  |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A5/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  1 new obsolescence markers
-  obsoleted 1 changesets
-
-  $ cd ../..
-
--- a/tests/test-push-checkheads-superceed-A6.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-====================================
-Testing head checking code: Case A-6
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch), same number of head
-
-.. old-state:
-..
-.. * 2 branch (1-changeset, and 2-changesets)
-..
-.. 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
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-.. B'◔⇢ø B
-..   | |
-.. A | ø⇠◔ A'
-..   | |/
-.. C ● |
-..    \|
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A6
-  $ cd A6
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd server
-  $ mkcommit B0
-  $ hg up 0
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ mkcommit C0
-  created new head
-  $ cd ../client
-  $ hg pull
-  pulling from $TESTTMP/A6/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
-  (run 'hg heads' to see heads, 'hg merge' to merge)
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit A1
-  created new head
-  $ hg up 'desc(C0)'
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit B1
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  1 new orphan changesets
-  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg log -G --hidden
-  @  d70a1f75a020 (draft): B1
-  |
-  | o  f6082bc4ffef (draft): A1
-  | |
-  o |  0f88766e02d6 (draft): C0
-  |/
-  | x  d73caddc5533 (draft): B0
-  | |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A6/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  2 new obsolescence markers
-  obsoleted 2 changesets
-
-  $ cd ../..
--- a/tests/test-push-checkheads-superceed-A7.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-====================================
-Testing head checking code: Case A-7
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head
-
-.. old-state:
-..
-.. * 2 branch (1-changeset, and 2-changesets)
-..
-.. 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
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..   B ø⇠◔ B'
-..     | |
-.. A'◔⇢ø |
-..   | |/
-.. C ● |
-..    \|
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A7
-  $ cd A7
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd server
-  $ mkcommit B0
-  $ hg up 0
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ mkcommit C0
-  created new head
-  $ cd ../client
-  $ hg pull
-  pulling from $TESTTMP/A7/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
-  (run 'hg heads' to see heads, 'hg merge' to merge)
-  $ hg up 'desc(C0)'
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit A1
-  $ hg up 0
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ mkcommit B1
-  created new head
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  1 new orphan changesets
-  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg log -G --hidden
-  @  25c56d33e4c4 (draft): B1
-  |
-  | o  a0802eb7fc1b (draft): A1
-  | |
-  | o  0f88766e02d6 (draft): C0
-  |/
-  | x  d73caddc5533 (draft): B0
-  | |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A7/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files (+1 heads)
-  2 new obsolescence markers
-  obsoleted 2 changesets
-
-  $ cd ../..
--- a/tests/test-push-checkheads-superceed-A8.t	Fri Sep 03 08:01:58 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-====================================
-Testing head checking code: Case A-8
-====================================
-
-Mercurial checks for the introduction of new heads on push. Evolution comes
-into play to detect if existing branches on the server are being replaced by
-some of the new one we push.
-
-This case is part of a series of tests checking this behavior.
-
-Category A: simple case involving a branch being superceeded by another.
-TestCase 8: single-changeset branch indirect rewrite
-
-.. old-state:
-..
-.. * 1-changeset branch
-..
-.. new-state:
-..
-.. * 1-changeset branch succeeding to A, through another unpushed changesets
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..       A'
-..   A ø⇠ø⇠◔ A''
-..     |/ /
-..     | /
-..     |/
-..     ●
-
-  $ . $TESTDIR/testlib/push-checkheads-util.sh
-
-Test setup
-----------
-
-  $ mkdir A8
-  $ cd A8
-  $ setuprepos
-  creating basic server and client repo
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd client
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit A1
-  created new head
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit A2
-  created new head
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
-  $ hg log -G --hidden
-  @  c1f8d089020f (draft): A2
-  |
-  | x  f6082bc4ffef (draft): A1
-  |/
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push
-  pushing to $TESTTMP/A8/server (glob)
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
-  obsoleted 1 changesets
-
-  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A1.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,72 @@
+====================================
+Testing head checking code: Case A-1
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category A: simple case involving a branch being superseded by another.
+TestCase 1: single-changeset branch
+
+.. old-state:
+..
+.. * 1 changeset branch
+..
+.. new-state:
+..
+.. * 1 changeset branch succeeding to A
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..   A ø⇠◔ A'
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A1
+  $ cd A1
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit A1
+  created new head
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  f6082bc4ffef (draft): A1
+  |
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A1/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files (+1 heads)
+  1 new obsolescence markers
+  obsoleted 1 changesets
+
+  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A2.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,94 @@
+====================================
+Testing head checking code: Case A-2
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category A: simple case involving a branch being superseded by another.
+TestCase 2: multi-changeset branch
+
+.. old-state:
+..
+.. * 1 branch with 2 changesets
+..
+.. new-state:
+..
+.. * another 2-changeset branch succeeding the old one
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..   B ø⇠◔ B'
+..     | |
+..   A ø⇠◔ A'
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A2
+  $ cd A2
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd server
+  $ mkcommit B0
+  $ cd ../client
+  $ hg pull
+  pulling from $TESTTMP/A2/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files
+  new changesets d73caddc5533 (1 drafts)
+  (run 'hg update' to get a working copy)
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit A1
+  created new head
+  $ mkcommit B1
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  1 new orphan changesets
+  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  262c8c798096 (draft): B1
+  |
+  o  f6082bc4ffef (draft): A1
+  |
+  | x  d73caddc5533 (draft): B0
+  | |
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A2/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  2 new obsolescence markers
+  obsoleted 2 changesets
+
+  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A3.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,97 @@
+====================================
+Testing head checking code: Case A-3
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category A: simple case involving a branch being superseded by another.
+TestCase 3: multi-changeset branch with reordering
+
+Push should be allowed
+.. old-state:
+..
+.. * 2 changeset branch
+..
+.. new-state:
+..
+.. * 2 changeset branch succeeding the old one with reordering
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..   B ø⇠⇠
+..     | ⇡
+..   A ø⇠⇠⇠○ A'
+..     | ⇡/
+..     | ○ B'
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A3
+  $ cd A3
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd server
+  $ mkcommit B0
+  $ cd ../client
+  $ hg pull
+  pulling from $TESTTMP/A3/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files
+  new changesets d73caddc5533 (1 drafts)
+  (run 'hg update' to get a working copy)
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit B1
+  created new head
+  $ mkcommit A1
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  1 new orphan changesets
+  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  c1c7524e9488 (draft): A1
+  |
+  o  25c56d33e4c4 (draft): B1
+  |
+  | x  d73caddc5533 (draft): B0
+  | |
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A3/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  2 new obsolescence markers
+  obsoleted 2 changesets
+
+  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A4.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,77 @@
+====================================
+Testing head checking code: Case A-4
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category A: simple case involving a branch being superseded by another.
+TestCase 4: New changeset as children of the successor
+
+.. old-state:
+..
+.. * 1-changeset branch
+..
+.. new-state:
+..
+.. * 2-changeset branch, first is a successor, but head is new
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..       ◔ B
+..       |
+..   A ø⇠◔ A'
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A4
+  $ cd A4
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit A1
+  created new head
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ mkcommit B0
+  $ hg log -G --hidden
+  @  f40ded968333 (draft): B0
+  |
+  o  f6082bc4ffef (draft): A1
+  |
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A4/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  1 new obsolescence markers
+  obsoleted 1 changesets
+
+  $ cd ../../
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A5.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,78 @@
+====================================
+Testing head checking code: Case A-5
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category A: simple case involving a branch being superseded by another.
+TestCase 5: New changeset as parent of the successor
+
+.. old-state:
+..
+.. * 1-changeset branch
+..
+.. new-state:
+..
+.. * 2rchangeset branch, head is a successor, but other is new
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..   A ø⇠◔ A'
+..     | |
+..     | ◔ B
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A5
+  $ cd A5
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit B0
+  created new head
+  $ mkcommit A1
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  ba93660aff8d (draft): A1
+  |
+  o  74ff5441d343 (draft): B0
+  |
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A5/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  1 new obsolescence markers
+  obsoleted 1 changesets
+
+  $ cd ../..
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A6.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,105 @@
+====================================
+Testing head checking code: Case A-6
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+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:
+..
+.. * 2 branch (1-changeset, and 2-changesets)
+..
+.. new-state:
+..
+.. * 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:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+.. B'◔⇢ø B
+..   | |
+.. A | ø⇠◔ A'
+..   | |/
+.. C ● |
+..    \|
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A6
+  $ cd A6
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd server
+  $ mkcommit B0
+  $ hg up 0
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ mkcommit C0
+  created new head
+  $ cd ../client
+  $ hg pull
+  pulling from $TESTTMP/A6/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit A1
+  created new head
+  $ hg up 'desc(C0)'
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit B1
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  1 new orphan changesets
+  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  d70a1f75a020 (draft): B1
+  |
+  | o  f6082bc4ffef (draft): A1
+  | |
+  o |  0f88766e02d6 (draft): C0
+  |/
+  | x  d73caddc5533 (draft): B0
+  | |
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A6/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  2 new obsolescence markers
+  obsoleted 2 changesets
+
+  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A7.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,105 @@
+====================================
+Testing head checking code: Case A-7
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+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:
+..
+.. * 2 branch (1-changeset, and 2-changesets)
+..
+.. new-state:
+..
+.. * 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:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..   B ø⇠◔ B'
+..     | |
+.. A'◔⇢ø |
+..   | |/
+.. C ● |
+..    \|
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A7
+  $ cd A7
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd server
+  $ mkcommit B0
+  $ hg up 0
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ mkcommit C0
+  created new head
+  $ cd ../client
+  $ hg pull
+  pulling from $TESTTMP/A7/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+  $ hg up 'desc(C0)'
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit A1
+  $ hg up 0
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ mkcommit B1
+  created new head
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  1 new orphan changesets
+  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  25c56d33e4c4 (draft): B1
+  |
+  | o  a0802eb7fc1b (draft): A1
+  | |
+  | o  0f88766e02d6 (draft): C0
+  |/
+  | x  d73caddc5533 (draft): B0
+  | |
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A7/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  2 new obsolescence markers
+  obsoleted 2 changesets
+
+  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-supersede-A8.t	Fri Sep 10 16:02:20 2021 +0300
@@ -0,0 +1,84 @@
+====================================
+Testing head checking code: Case A-8
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category A: simple case involving a branch being superseded by another.
+TestCase 8: single-changeset branch indirect rewrite
+
+.. old-state:
+..
+.. * 1-changeset branch
+..
+.. new-state:
+..
+.. * 1-changeset branch succeeding to A, through another unpushed changesets
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..       A'
+..   A ø⇠ø⇠◔ A''
+..     |/ /
+..     | /
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir A8
+  $ cd A8
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit A1
+  created new head
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ mkcommit A2
+  created new head
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  c1f8d089020f (draft): A2
+  |
+  | x  f6082bc4ffef (draft): A1
+  |/
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/A8/server (glob)
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files (+1 heads)
+  2 new obsolescence markers
+  obsoleted 1 changesets
+
+  $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D4.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-unpushed-D4.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-push-checkheads-unpushed-D5.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-push-checkheads-unpushed-D5.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-single-head-obsolescence-named-branch-A1.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-single-head-obsolescence-named-branch-A1.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-single-head-obsolescence-named-branch-A2.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-single-head-obsolescence-named-branch-A2.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-single-head-obsolescence-named-branch-A3.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-single-head-obsolescence-named-branch-A3.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-single-head-obsolescence-topic-B1.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-single-head-obsolescence-topic-B1.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-single-head-obsolescence-topic-B2.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-single-head-obsolescence-topic-B2.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..
--- a/tests/test-single-head-obsolescence-topic-B3.t	Fri Sep 03 08:01:58 2021 +0300
+++ b/tests/test-single-head-obsolescence-topic-B3.t	Fri Sep 10 16:02:20 2021 +0300
@@ -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:
 ..