diff -r d65318bf1782 -r 28bda23bd8c5 tests/test-checkheads-unpushed-D2.t
--- a/tests/test-checkheads-unpushed-D2.t	Fri Mar 31 15:47:31 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-====================================
-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.
-
-This test file 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
-
-.. old-state:
-..
-.. * 1 changeset branch
-..
-.. new-state:
-..
-.. * old head is pruned
-.. * 1 new branch succeeding to the other changeset in the old branch
-.. * 1 new unrelated branch
-..
-.. expected-result:
-..
-.. * push allowed
-.. * pushing only the unrelated branch: denied
-..
-.. graph-summary:
-..
-..   B ⊗
-..     |
-..   A ø⇠○ A'
-..     |/
-..     | ◔ C
-..     |/
-..     ○
-
-  $ . $TESTDIR/testlib/checkheads-util.sh
-
-Test setup
-----------
-
-  $ 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/server
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  (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)"`
-  $ hg debugobsolete --record-parents `getid "desc(B0)"`
-  $ hg up 0
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit C0
-  created new head
-  $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
-  |
-  | o  f6082bc4ffef (draft): A1
-  |/
-  | x  d73caddc5533 (draft): B0
-  | |
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-  
-
-Actual testing
---------------
-
-  $ hg push --rev 'desc(C0)'
-  pushing to $TESTTMP/server
-  searching for changes
-  abort: push creates new remote head 0f88766e02d6!
-  (merge or see 'hg help push' for details about pushing new heads)
-  [255]
-