Mercurial > hg > evolve

changeset 2373:61d885899466 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkheads: update tests to match the one in core These test now exists in core, so we update the evolve version.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 20 Apr 2017 12:24:43 +0200
parents 2d55ae0d6ce7
children 2db189baf8b7 812b866f193c
files tests/test-checkheads-partial-C1.t tests/test-checkheads-partial-C2.t tests/test-checkheads-partial-C3.t tests/test-checkheads-partial-C4.t tests/test-checkheads-pruned-B1.t tests/test-checkheads-pruned-B2.t tests/test-checkheads-pruned-B3.t tests/test-checkheads-pruned-B4.t tests/test-checkheads-pruned-B5.t tests/test-checkheads-pruned-B6.t tests/test-checkheads-pruned-B7.t tests/test-checkheads-pruned-B8.t tests/test-checkheads-superceed-A1.t tests/test-checkheads-superceed-A2.t tests/test-checkheads-superceed-A3.t tests/test-checkheads-superceed-A4.t tests/test-checkheads-superceed-A5.t tests/test-checkheads-superceed-A6.t tests/test-checkheads-superceed-A7.t tests/test-checkheads-superceed-A8.t tests/test-checkheads-unpushed-D1.t tests/test-checkheads-unpushed-D2.t tests/test-checkheads-unpushed-D3.t tests/test-checkheads-unpushed-D4.t tests/test-checkheads-unpushed-D5.t tests/test-checkheads-unpushed-D6.t tests/test-checkheads-unpushed-D7.t tests/test-push-checkheads-partial-C1.t tests/test-push-checkheads-partial-C2.t tests/test-push-checkheads-partial-C3.t tests/test-push-checkheads-partial-C4.t tests/test-push-checkheads-pruned-B1.t tests/test-push-checkheads-pruned-B2.t tests/test-push-checkheads-pruned-B3.t tests/test-push-checkheads-pruned-B4.t tests/test-push-checkheads-pruned-B5.t tests/test-push-checkheads-pruned-B6.t tests/test-push-checkheads-pruned-B7.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-D1.t tests/test-push-checkheads-unpushed-D2.t tests/test-push-checkheads-unpushed-D3.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t tests/test-push-checkheads-unpushed-D6.t tests/test-push-checkheads-unpushed-D7.t tests/testlib/checkheads-util.sh tests/testlib/push-checkheads-util.sh
diffstat 28 files changed, 357 insertions(+), 264 deletions(-) [+]
line wrap: on
line diff
rename from tests/test-checkheads-partial-C1.t
rename to tests/test-push-checkheads-partial-C1.t
--- a/tests/test-checkheads-partial-C1.t
+++ b/tests/test-push-checkheads-partial-C1.t
@@ -32,7 +32,7 @@
 ..     |/
 ..     ○
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
rename from tests/test-checkheads-partial-C2.t
rename to tests/test-push-checkheads-partial-C2.t
--- a/tests/test-checkheads-partial-C2.t
+++ b/tests/test-push-checkheads-partial-C2.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case C-2
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category C: checking case were the branch is only partially obsoleted.
+Category C: case were the branch is only partially obsoleted
 TestCase 2: 2 changeset branch, only the base is rewritten
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..     |
 ..   A ø⇠◔ A'
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir C2
+  $ cd C2
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -45,7 +47,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/C2/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -67,13 +69,14 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push --rev 'desc(A1)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/C2/server (glob)
   searching for changes
   abort: push creates new remote head f6082bc4ffef!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
+
+  $ cd ../..
rename from tests/test-checkheads-partial-C3.t
rename to tests/test-push-checkheads-partial-C3.t
--- a/tests/test-checkheads-partial-C3.t
+++ b/tests/test-push-checkheads-partial-C3.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case C-3
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category C: checking case were the branch is only partially obsoleted.
+Category C: case were the branch is only partially obsoleted
 TestCase 3: 2 changeset branch, only the head is pruned
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..     |
 ..   A ◔ ◔ C
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir C3
+  $ cd C3
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -45,7 +47,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/C3/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -71,8 +73,10 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/C3/server (glob)
   searching for changes
   abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
+
+  $ cd ../..
rename from tests/test-checkheads-partial-C4.t
rename to tests/test-push-checkheads-partial-C4.t
--- a/tests/test-checkheads-partial-C4.t
+++ b/tests/test-push-checkheads-partial-C4.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case C-4
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category C: checking case were the branch is only partially obsoleted.
+Category C: case were the branch is only partially obsoleted
 TestCase 4: 2 changeset branch, only the base is pruned
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..     |
 ..   A ⊗ ◔ C
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir C4
+  $ cd C4
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -45,7 +47,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/C4/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -71,8 +73,10 @@
 --------------
 
   $ hg push --rev 'desc(C0)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/C4/server (glob)
   searching for changes
   abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
+
+  $ cd ../..
rename from tests/test-checkheads-pruned-B1.t
rename to tests/test-push-checkheads-pruned-B1.t
--- a/tests/test-checkheads-pruned-B1.t
+++ b/tests/test-push-checkheads-pruned-B1.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-1
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 1: single pruned changeset
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..       |
 ..   A ⊗ |
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B1
+  $ cd B1
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -59,7 +61,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B1/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -67,5 +69,4 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
 
-
-
+  $ cd ../..
rename from tests/test-checkheads-pruned-B2.t
rename to tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-checkheads-pruned-B2.t
+++ b/tests/test-push-checkheads-pruned-B2.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-2
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 2: multi-changeset branch, head is pruned, rest is superceeded
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..     |
 ..   A ø⇠◔ A'
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B2
+  $ cd B2
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -45,7 +47,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/B2/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -72,7 +74,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B2/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -80,3 +82,4 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
 
+  $ cd ../..
rename from tests/test-checkheads-pruned-B3.t
rename to tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-checkheads-pruned-B3.t
+++ b/tests/test-push-checkheads-pruned-B3.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-3
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 3: multi-changeset branch, other is pruned, rest is superceeded
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..     | |
 ..   A ⊗ |
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B3
+  $ cd B3
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -45,7 +47,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/B3/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -72,7 +74,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B3/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -80,3 +82,5 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
 
+  $ cd ../..
+
rename from tests/test-checkheads-pruned-B4.t
rename to tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-checkheads-pruned-B4.t
+++ b/tests/test-push-checkheads-pruned-B4.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-4
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 4: multi-changeset branch, all are pruned
 
 .. old-state:
@@ -31,13 +31,15 @@
 ..     |
 ..     | ◔ C
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B4
+  $ cd B4
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -46,7 +48,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/B4/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -73,7 +75,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B4/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -81,3 +83,4 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
 
+  $ cd ../..
rename from tests/test-checkheads-pruned-B5.t
rename to tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-checkheads-pruned-B5.t
+++ b/tests/test-push-checkheads-pruned-B5.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-5
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 5: multi-changeset branch, mix of pruned and superceeded
 
 .. old-state:
@@ -33,13 +33,15 @@
 ..     | |
 ..   B ⊗ |
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B5
+  $ cd B5
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -49,7 +51,7 @@
   $ mkcommit C0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/B5/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -79,7 +81,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B5/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -87,3 +89,4 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   3 new obsolescence markers
 
+  $ cd ../..
rename from tests/test-checkheads-pruned-B6.t
rename to tests/test-push-checkheads-pruned-B6.t
--- a/tests/test-checkheads-pruned-B6.t
+++ b/tests/test-push-checkheads-pruned-B6.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-6
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 6: single changesets, pruned then superseeded (on a new changeset)
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..     | |
 ..     | ◔ B
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B6
+  $ cd B6
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -65,10 +67,12 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B6/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
+
+  $ cd ../..
rename from tests/test-checkheads-pruned-B7.t
rename to tests/test-push-checkheads-pruned-B7.t
--- a/tests/test-checkheads-pruned-B7.t
+++ b/tests/test-push-checkheads-pruned-B7.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-7
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 7: single changesets, pruned then superseeded (on an existing changeset)
 
 .. old-state:
@@ -31,11 +31,13 @@
 ..    \|/
 ..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B7
+  $ cd B7
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -64,10 +66,12 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B7/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
+
+  $ cd ../..
rename from tests/test-checkheads-pruned-B8.t
rename to tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-checkheads-pruned-B8.t
+++ b/tests/test-push-checkheads-pruned-B8.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case B-2
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category B: checking simple case involving pruned changesets
+Category B: simple case involving pruned changesets
 TestCase 2: multi-changeset branch, head is pruned, rest is superceeded, through other
 
 .. old-state:
@@ -32,13 +32,15 @@
 ..     |/ /
 ..     | /
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir B8
+  $ cd B8
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -47,7 +49,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/B8/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -85,7 +87,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/B8/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -93,3 +95,4 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   4 new obsolescence markers
 
+  $ cd ../..
rename from tests/test-checkheads-superceed-A1.t
rename to tests/test-push-checkheads-superceed-A1.t
--- a/tests/test-checkheads-superceed-A1.t
+++ b/tests/test-push-checkheads-superceed-A1.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case A-1
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
+Category A: simple case involving a branch being superceeded by another.
 TestCase 1: single-changeset branch
 
 .. old-state:
@@ -27,13 +27,15 @@
 ..
 ..   A ø⇠◔ A'
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A1
+  $ cd A1
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -56,7 +58,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/A1/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -64,5 +66,4 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
 
-
-
+  $ cd ../..
rename from tests/test-checkheads-superceed-A2.t
rename to tests/test-push-checkheads-superceed-A2.t
--- a/tests/test-checkheads-superceed-A2.t
+++ b/tests/test-push-checkheads-superceed-A2.t
@@ -2,22 +2,22 @@
 Testing head checking code: Case A-2
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
+Category A: simple case involving a branch being superceeded by another.
 TestCase 2: multi-changeset branch
 
 .. old-state:
 ..
-.. * 2 changeset branch
+.. * 1 branch with 2 changesets
 ..
 .. new-state:
 ..
-.. * 2 changeset branch succeeding the old one
+.. * another 2-changeset branch succeeding the old one
 ..
 .. expected-result:
 ..
@@ -29,13 +29,15 @@
 ..     | |
 ..   A ø⇠◔ A'
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A2
+  $ cd A2
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -44,7 +46,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/A2/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -70,15 +72,16 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  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
+
+  $ cd ../..
rename from tests/test-checkheads-superceed-A3.t
rename to tests/test-push-checkheads-superceed-A3.t
--- a/tests/test-checkheads-superceed-A3.t
+++ b/tests/test-push-checkheads-superceed-A3.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case A-3
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
+Category A: simple case involving a branch being superceeded by another.
 TestCase 3: multi-changeset branch with reordering
 
 Push should be allowed
@@ -32,13 +32,15 @@
 ..     | ⇡/
 ..     | ○ B'
 ..     |/
-..     ● O
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A3
+  $ cd A3
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -47,7 +49,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/A3/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -73,15 +75,16 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  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
+
+  $ cd ../..
rename from tests/test-checkheads-superceed-A4.t
rename to tests/test-push-checkheads-superceed-A4.t
--- a/tests/test-checkheads-superceed-A4.t
+++ b/tests/test-push-checkheads-superceed-A4.t
@@ -2,22 +2,22 @@
 Testing head checking code: Case A-4
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
+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
+.. * 1-changeset branch
 ..
 .. new-state:
 ..
-.. * 2 changeset branch, first is a successor, but head is new
+.. * 2-changeset branch, first is a successor, but head is new
 ..
 .. expected-result:
 ..
@@ -29,13 +29,15 @@
 ..       |
 ..   A ø⇠◔ A'
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A4
+  $ cd A4
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -57,12 +59,11 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/A4/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -70,5 +71,4 @@
   added 2 changesets with 2 changes to 2 files (+1 heads)
   1 new obsolescence markers
 
-
-
+  $ cd ../../
rename from tests/test-checkheads-superceed-A5.t
rename to tests/test-push-checkheads-superceed-A5.t
--- a/tests/test-checkheads-superceed-A5.t
+++ b/tests/test-push-checkheads-superceed-A5.t
@@ -2,22 +2,22 @@
 Testing head checking code: Case A-5
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
+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
+.. * 1-changeset branch
 ..
 .. new-state:
 ..
-.. * 2 changeset branch, head is a successor, but other is new
+.. * 2rchangeset branch, head is a successor, but other is new
 ..
 .. expected-result:
 ..
@@ -29,13 +29,15 @@
 ..     | |
 ..     | ◔ B
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A5
+  $ cd A5
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -57,12 +59,11 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/A5/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -70,5 +71,5 @@
   added 2 changesets with 2 changes to 2 files (+1 heads)
   1 new obsolescence markers
 
+  $ cd ../..
 
-
rename from tests/test-checkheads-superceed-A6.t
rename to tests/test-push-checkheads-superceed-A6.t
--- a/tests/test-checkheads-superceed-A6.t
+++ b/tests/test-push-checkheads-superceed-A6.t
@@ -2,18 +2,18 @@
 Testing head checking code: Case A-6
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
-TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch)
+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)
+.. * 2 branch (1-changeset, and 2-changesets)
 ..
 .. new-state:
 ..
@@ -34,11 +34,13 @@
 ..    \|
 ..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A6
+  $ cd A6
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -51,7 +53,7 @@
   created new head
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/A6/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -81,15 +83,16 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  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
+
+  $ cd ../..
rename from tests/test-checkheads-superceed-A7.t
rename to tests/test-push-checkheads-superceed-A7.t
--- a/tests/test-checkheads-superceed-A7.t
+++ b/tests/test-push-checkheads-superceed-A7.t
@@ -2,18 +2,18 @@
 Testing head checking code: Case A-7
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
-TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch)
+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)
+.. * 2 branch (1-changeset, and 2-changesets)
 ..
 .. new-state:
 ..
@@ -34,11 +34,13 @@
 ..    \|
 ..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A7
+  $ cd A7
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -51,7 +53,7 @@
   created new head
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/A7/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -81,15 +83,16 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  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
+
+  $ cd ../..
rename from tests/test-checkheads-superceed-A8.t
rename to tests/test-push-checkheads-superceed-A8.t
--- a/tests/test-checkheads-superceed-A8.t
+++ b/tests/test-push-checkheads-superceed-A8.t
@@ -2,22 +2,22 @@
 Testing head checking code: Case A-8
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+This case is part of a series of tests checking this behavior.
 
-Category A: checking simple case invoving a branch being superceeded by another.
+Category A: simple case involving a branch being superceeded by another.
 TestCase 8: single-changeset branch indirect rewrite
 
 .. old-state:
 ..
-.. * 1 changeset branch
+.. * 1-changeset branch
 ..
 .. new-state:
 ..
-.. * 1 changeset branch succeeding to A, through another unpushed changesets
+.. * 1-changeset branch succeeding to A, through another unpushed changesets
 ..
 .. expected-result:
 ..
@@ -30,13 +30,15 @@
 ..     |/ /
 ..     | /
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir A8
+  $ cd A8
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -66,7 +68,7 @@
 --------------
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/A8/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -74,5 +76,4 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
 
-
-
+  $ cd ../..
rename from tests/test-checkheads-unpushed-D1.t
rename to tests/test-push-checkheads-unpushed-D1.t
--- a/tests/test-checkheads-unpushed-D1.t
+++ b/tests/test-push-checkheads-unpushed-D1.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case D-1
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+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.
+Category D: remote head is "obs-affected" locally, but result is not part of the push
 TestCase 1: remote head is rewritten, but successors is not part of the push
 
 .. old-state:
@@ -30,13 +30,15 @@
 ..     |/
 ..     | ◔ B
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir D1
+  $ cd D1
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -65,11 +67,11 @@
 --------------
 
   $ hg push -r 'desc(B0)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D1/server (glob)
   searching for changes
   abort: push creates new remote head 74ff5441d343!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
+  $ cd ../..
 
-
rename from tests/test-checkheads-unpushed-D2.t
rename to tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-checkheads-unpushed-D2.t
+++ b/tests/test-push-checkheads-unpushed-D2.t
@@ -2,14 +2,14 @@
 Testing head checking code: Case D-2
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+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 1: remote branch has 2 changes, head is pruned, second is rewritten but result is not pushed
+Category D: remote head is "obs-affected" locally, but result is not part of the push
+TestCase 1: remote branch has 2 changes, head is pruned, other is rewritten but result is not pushed
 
 .. old-state:
 ..
@@ -34,13 +34,15 @@
 ..     |/
 ..     | ◔ C
 ..     |/
-..     ○
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir D2
+  $ cd D2
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -49,7 +51,7 @@
   $ mkcommit B0
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/D2/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -82,9 +84,10 @@
 --------------
 
   $ hg push --rev 'desc(C0)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D2/server (glob)
   searching for changes
   abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
+  $ cd ../..
rename from tests/test-checkheads-unpushed-D3.t
rename to tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-checkheads-unpushed-D3.t
+++ b/tests/test-push-checkheads-unpushed-D3.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case D-3
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+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.
+Category D: remote head is "obs-affected" locally, but result is not part of the push
 TestCase 3: multi-changeset branch, split on multiple new others, only one of them is pushed
 
 .. old-state:
@@ -33,11 +33,13 @@
 ..    \|
 ..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir D3
+  $ cd D3
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -48,7 +50,7 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/D3/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -77,18 +79,17 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push --rev 'desc(A1)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D3/server (glob)
   searching for changes
   abort: push creates new remote head f6082bc4ffef!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg push --rev 'desc(B1)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D3/server (glob)
   searching for changes
   abort: push creates new remote head 25c56d33e4c4!
   (merge or see 'hg help push' for details about pushing new heads)
@@ -100,8 +101,10 @@
 In this case, even a bare push is creating more heads
 
   $ hg push
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D3/server (glob)
   searching for changes
   abort: push creates new remote head 25c56d33e4c4!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
+
+  $ cd ../..
rename from tests/test-checkheads-unpushed-D4.t
rename to tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-checkheads-unpushed-D4.t
+++ b/tests/test-push-checkheads-unpushed-D4.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case D-4
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+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.
+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:
@@ -22,24 +22,39 @@
 ..
 .. expected-result:
 ..
-.. * push the new branch only -> push denied
-.. * push the existing branch only -> push allowed
+.. * 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:
 ..
-.. B'◔⇢ø B
+.. (variant a)
+..
+.. B'○⇢ø B
 ..   | |
 .. A | ø⇠◔ A'
 ..   | |/
 .. C ● |
 ..    \|
 ..     ●
+..
+.. or (variant b)
+..
+.. B'◔⇢ø B
+..   | |
+.. A | ø⇠○ A'
+..   | |/
+.. C ● |
+..    \|
+..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir D4
+  $ cd D4
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -52,7 +67,7 @@
   created new head
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/D4/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -82,21 +97,26 @@
   o  1e4be0697311 (public): root
   
 
-
-Actual testing
---------------
+Actual testing (new branch only)
+--------------------------------
 
   $ hg push --rev 'desc(A1)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D4/server (glob)
   searching for changes
   abort: push creates new remote head f6082bc4ffef!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
+
+Actual testing (existing branch only)
+------------------------------------
+
   $ hg push --rev 'desc(B1)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D4/server (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
+
+  $ cd ../..
rename from tests/test-checkheads-unpushed-D5.t
rename to tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-checkheads-unpushed-D5.t
+++ b/tests/test-push-checkheads-unpushed-D5.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case D-5
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+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.
+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:
@@ -37,11 +37,13 @@
 ..    \|
 ..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir D5
+  $ cd D5
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -54,7 +56,7 @@
   created new head
   $ cd ../client
   $ hg pull
-  pulling from $TESTTMP/server
+  pulling from $TESTTMP/D5/server (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -84,21 +86,22 @@
   o  1e4be0697311 (public): root
   
 
-
 Actual testing
 --------------
 
   $ hg push --rev 'desc(B1)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D5/server (glob)
   searching for changes
   abort: push creates new remote head 25c56d33e4c4!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg push --rev 'desc(A1)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D5/server (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
+
+  $ cd ../..
rename from tests/test-checkheads-unpushed-D6.t
rename to tests/test-push-checkheads-unpushed-D6.t
--- a/tests/test-checkheads-unpushed-D6.t
+++ b/tests/test-push-checkheads-unpushed-D6.t
@@ -2,16 +2,16 @@
 Testing head checking code: Case D-6
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+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 6: single changesets, superseeded then pruned (on a new changeset unpushed) changeset
+Category D: remote head is "obs-affected" locally, but result is not part of the push
+TestCase 6: single changeset, superseeded then pruned (on a new changeset unpushed) changeset
 
-This is a partial push variation of B6
+This is a partial push variation of case B-6
 
 .. old-state:
 ..
@@ -30,15 +30,17 @@
 ..
 ..   A ø⇠⊗ A'
 ..     | |
-.. C ◔ | ◔ B
+.. C ◔ | ○ B
 ..    \|/
 ..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir D6
+  $ cd D6
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -71,8 +73,10 @@
 --------------
 
   $ hg push --rev 'desc(C0)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D6/server (glob)
   searching for changes
   abort: push creates new remote head 0f88766e02d6!
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
+
+  $ cd ../..
rename from tests/test-checkheads-unpushed-D7.t
rename to tests/test-push-checkheads-unpushed-D7.t
--- a/tests/test-checkheads-unpushed-D7.t
+++ b/tests/test-push-checkheads-unpushed-D7.t
@@ -2,13 +2,13 @@
 Testing head checking code: Case D-7
 ====================================
 
-Mercurial checks for the introduction of multiple heads on push. Evolution
-comes into play to detect if existing heads on the server are being replaced by
-some of the new heads we push.
+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 test file is part of a series of tests checking this behavior.
+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.
+Category D: remote head is "obs-affected" locally, but result is not part of the push
 TestCase 7: single changesets, superseeded multiple time then pruned (on a new changeset unpushed) changeset
 
 This is a partial push variation of B6
@@ -39,11 +39,13 @@
 ..     |
 ..     ●
 
-  $ . $TESTDIR/testlib/checkheads-util.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
 
 Test setup
 ----------
 
+  $ mkdir D7
+  $ cd D7
   $ setuprepos
   creating basic server and client repo
   updating to branch default
@@ -83,10 +85,12 @@
 --------------
 
   $ hg push --rev 'desc(C0)'
-  pushing to $TESTTMP/server
+  pushing to $TESTTMP/D7/server (glob)
   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
+
+  $ cd ../..
rename from tests/testlib/checkheads-util.sh
rename to tests/testlib/push-checkheads-util.sh
--- a/tests/testlib/checkheads-util.sh
+++ b/tests/testlib/push-checkheads-util.sh
@@ -1,15 +1,18 @@
-# common setup for head checking code
+# setup config and various utility to test new heads checks on push
 
 . $TESTDIR/testlib/common.sh
 
 cat >> $HGRCPATH <<EOF
 [ui]
+# simpler log output
 logtemplate ="{node|short} ({phase}): {desc}\n"
 
 [phases]
+# non publishing server
 publish=False
 
 [extensions]
+# we need to strip some changeset for some test cases
 strip=
 evolve=
 EOF
@@ -21,6 +24,6 @@
     mkcommit root
     hg phase --public .
     mkcommit A0
-    cd .. 
+    cd ..
     hg clone server client
 }