tests: fix misspelling of supersede

Differential Revision: https://phab.mercurial-scm.org/D12589

tests/test-push-checkheads-partial-C1.t

@@ -1,85 +1,85 b''
 ====================================
 Testing head checking code: Case C-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 C: checking case were the branch is only partially obsoleted.
 TestCase 1: 2 changeset branch, only the head is rewritten
 
 .. old-state:
 ..
 .. * 2 changeset branch
 ..
 .. 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:
 ..
 .. * push denied
 ..
 .. graph-summary:
 ..
 ..   B ø⇠◔ B'
 ..     | |
 ..   A ○ |
 ..     |/
 ..     ○
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir C1
   $ cd C1
   $ 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/C1/server
   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
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
   | x  d73caddc5533 (draft): B0
   | |
   | o  8aaa48160adc (draft): A0
   |/
   o  1e4be0697311 (public): root
   
 
 Actual testing
 --------------
 
   $ hg push
   pushing to $TESTTMP/C1/server
   searching for changes
   abort: push creates new remote head 25c56d33e4c4
   (merge or see 'hg help push' for details about pushing new heads)
   [20]
 
   $ cd ../..

tests/test-push-checkheads-partial-C2.t

@@ -1,86 +1,86 b''
 ====================================
 Testing head checking code: Case C-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 C: case were the branch is only partially obsoleted
 TestCase 2: 2 changeset branch, only the base is rewritten
 
 .. old-state:
 ..
 .. * 2 changeset branch
 ..
 .. 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:
 ..
 .. * push denied
 ..
 .. graph-summary:
 ..
 ..   B ○
 ..     |
 ..   A ø⇠◔ A'
 ..     |/
 ..     ●
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir C2
   $ cd C2
   $ 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/C2/server
   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
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
   | *  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
   o  1e4be0697311 (public): root
   
 
 Actual testing
 --------------
 
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/C2/server
   searching for changes
   abort: push creates new remote head f6082bc4ffef
   (merge or see 'hg help push' for details about pushing new heads)
   [20]
 
   $ cd ../..

tests/test-push-checkheads-pruned-B2.t

@@ -1,92 +1,92 b''
 ====================================
 Testing head checking code: Case B-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 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:
 ..
 .. * 2 changeset branch
 ..
 .. new-state:
 ..
 .. * old head is pruned
 .. * 1 new branch succeeding to the other changeset in the old branch
 ..
 .. expected-result:
 ..
 .. * push allowed
 ..
 .. graph-summary:
 ..
 ..   B ⊗
 ..     |
 ..   A ø⇠◔ A'
 ..     |/
 ..     ●
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir B2
   $ cd B2
   $ 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/B2/server
   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
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
   | x  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
   o  1e4be0697311 (public): root
   
 
 Actual testing
 --------------
 
   $ hg push
   pushing to $TESTTMP/B2/server
   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 2 changesets
 
   $ cd ../..

tests/test-push-checkheads-pruned-B3.t

@@ -1,93 +1,93 b''
 ====================================
 Testing head checking code: Case B-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 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:
 ..
 .. * 2 changeset branch
 ..
 .. new-state:
 ..
-.. * old head is superceeded
+.. * old head is superseded
 .. * old other is pruned
 ..
 .. expected-result:
 ..
 .. * push allowed
 ..
 .. graph-summary:
 ..
 ..   B ø⇠◔ B'
 ..     | |
 ..   A ⊗ |
 ..     |/
 ..     ●
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir B3
   $ cd B3
   $ 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/B3/server
   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
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   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
   |
   | x  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
   o  1e4be0697311 (public): root
   
 
 Actual testing
 --------------
 
   $ hg push
   pushing to $TESTTMP/B3/server
   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 2 changesets
 
   $ cd ../..
 

tests/test-push-checkheads-pruned-B5.t

@@ -1,101 +1,101 b''
 ====================================
 Testing head checking code: Case B-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 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:
 ..
 .. * 3 changeset branch
 ..
 .. new-state:
 ..
 .. * old head is pruned
-.. * old mid is superceeded
+.. * old mid is superseded
 .. * old root is pruned
 ..
 .. expected-result:
 ..
 .. * push allowed
 ..
 .. graph-summary:
 ..
 ..   B ⊗
 ..     |
 ..   A ø⇠◔ A'
 ..     | |
 ..   B ⊗ |
 ..     |/
 ..     ●
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir B5
   $ cd B5
   $ 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
   $ mkcommit C0
   $ cd ../client
   $ hg pull
   pulling from $TESTTMP/B5/server
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   new changesets d73caddc5533:821fb21d0dd2 (2 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
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   2 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(C0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
   | x  821fb21d0dd2 (draft): C0
   | |
   | x  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
   o  1e4be0697311 (public): root
   
 
 Actual testing
 --------------
 
   $ hg push
   pushing to $TESTTMP/B5/server
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   3 new obsolescence markers
   obsoleted 3 changesets
 
   $ cd ../..

tests/test-push-checkheads-pruned-B8.t

@@ -1,109 +1,109 b''
 ====================================
 Testing head checking code: Case B-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 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:
 ..
 .. * 2 changeset branch
 ..
 .. new-state:
 ..
 .. * old head is rewritten then pruned
 .. * 1 new branch succeeding to the other changeset in the old branch (through another obsolete branch)
 ..
 .. expected-result:
 ..
 .. * push allowed
 ..
 .. graph-summary:
 ..
 ..   B ø⇠⊗ B'
 ..     | | A'
 ..   A ø⇠ø⇠◔ A''
 ..     |/ /
 ..     | /
 ..     |/
 ..     ●
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir B8
   $ cd B8
   $ 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/B8/server
   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 up 0
   0 files updated, 0 files merged, 2 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
   1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(B1)"`
   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  262c8c798096 (draft): B1
   | |
   | x  f6082bc4ffef (draft): A1
   |/
   | x  d73caddc5533 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
   o  1e4be0697311 (public): root
   
 
 Actual testing
 --------------
 
   $ hg push
   pushing to $TESTTMP/B8/server
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   4 new obsolescence markers
   obsoleted 2 changesets
 
   $ cd ../..

tests/test-push-checkheads-superceed-A1.t

@@ -1,72 +1,72 b''
 ====================================
 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.
+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
   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 ../..

tests/test-push-checkheads-superceed-A2.t

@@ -1,94 +1,94 b''
 ====================================
 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.
+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
   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
   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 ../..

tests/test-push-checkheads-superceed-A3.t

@@ -1,97 +1,97 b''
 ====================================
 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.
+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
   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
   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 ../..

tests/test-push-checkheads-superceed-A4.t

@@ -1,77 +1,77 b''
 ====================================
 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.
+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
   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 ../../

tests/test-push-checkheads-superceed-A5.t

@@ -1,78 +1,78 b''
 ====================================
 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.
+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
   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 ../..
 

tests/test-push-checkheads-superceed-A6.t

@@ -1,105 +1,105 b''
 ====================================
 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.
+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 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:
 ..
 .. * 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
   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
   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 ../..

tests/test-push-checkheads-superceed-A7.t

@@ -1,105 +1,105 b''
 ====================================
 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.
+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 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:
 ..
 .. * 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
   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
   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 ../..

tests/test-push-checkheads-superceed-A8.t

@@ -1,84 +1,84 b''
 ====================================
 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.
+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
   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 ../..

tests/test-push-checkheads-unpushed-D4.t

@@ -1,129 +1,129 b''
 ====================================
 Testing head checking code: Case D-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 D: remote head is "obs-affected" locally, but result is not part of the push
 TestCase 4: multi-changeset branch, split on multiple other, (base on its own new branch)
 
 .. 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
+.. * 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 the new branch only -> push denied (variant a)
 .. * push the existing branch only -> push allowed (variant b)
 .. (pushing all is tested as case A-7)
 ..
 .. graph-summary:
 ..
 .. (variant a)
 ..
 .. B'○⇢ø B
 ..   | |
 .. A | ø⇠◔ A'
 ..   | |/
 .. C ● |
 ..    \|
 ..     ●
 ..
 .. or (variant b)
 ..
 .. B'◔⇢ø B
 ..   | |
 .. A | ø⇠○ A'
 ..   | |/
 .. C ● |
 ..    \|
 ..     ●
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir D4
   $ cd D4
   $ 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/D4/server
   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 (new branch only)
 --------------------------------
 
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/D4/server
   searching for changes
   abort: push creates new remote head f6082bc4ffef
   (merge or see 'hg help push' for details about pushing new heads)
   [20]
 
 Actual testing (existing branch only)
 ------------------------------------
 
   $ hg push --rev 'desc(B1)'
   pushing to $TESTTMP/D4/server
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ cd ../..

tests/test-push-checkheads-unpushed-D5.t

@@ -1,115 +1,115 b''
 ====================================
 Testing head checking code: Case D-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 D: remote head is "obs-affected" locally, but result is not part of the push
 TestCase 5: multi-changeset branch, split on multiple other, (head on its own new branch)
 
 .. 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
+.. * 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 the new branch only -> push denied
 .. * push the existing branch only -> push allowed
 ..   /!\ This push create unstability/orphaning on the other hand and we should
 ..  probably detect/warn agains that.
 ..
 .. graph-summary:
 ..
 ..   B ø⇠◔ B'
 ..     | |
 .. A'◔⇢ø |
 ..   | |/
 .. C ● |
 ..    \|
 ..     ●
 
   $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
   $ mkdir D5
   $ cd D5
   $ 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/D5/server
   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 --rev 'desc(B1)'
   pushing to $TESTTMP/D5/server
   searching for changes
   abort: push creates new remote head 25c56d33e4c4
   (merge or see 'hg help push' for details about pushing new heads)
   [20]
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/D5/server
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
 
   $ cd ../..