tests/test-checkheads-superceed-A3.t
branchmercurial-3.9
changeset 2279 347849e17876
parent 2261 3e339f6717c7
parent 2278 2db189baf8b7
child 2280 28bda23bd8c5
child 2319 ee321b87c548
--- a/tests/test-checkheads-superceed-A3.t	Fri Mar 31 15:44:10 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-====================================
-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.
-
-This test file is part of a series of tests checking this behavior.
-
-Category A: checking simple case invoving a branch being superceeded by another.
-TestCase 3: multi-changeset branch with reordering
-
-Push should be allowed
-.. old-state:
-..
-.. * 2 changeset branch
-..
-.. new-state:
-..
-.. * 2 changeset branch succeeding the old one with reordering
-..
-.. expected-result:
-..
-.. * push allowed
-..
-.. graph-summary:
-..
-..   B ø⇠⇠
-..     | ⇡
-..   A ø⇠⇠⇠○ A'
-..     | ⇡/
-..     | ○ B'
-..     |/
-..     ● O
-
-  $ . $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 B1
-  created new head
-  $ mkcommit A1
-  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  $ 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/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