# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1490960834 -7200
# Node ID 5b33df335b6c16818c9a1444af852ce4f52eabfc
# Parent  446ed4c21bf6a87d40f8797ef732ff41863efec0
checkheads: add test where the rewrite of the other branch is not direct

This will help testing that our logic is properly transitive.

diff -r 446ed4c21bf6 -r 5b33df335b6c tests/test-checkheads-pruned-B8.t
--- a/tests/test-checkheads-pruned-B8.t	Fri Mar 31 13:45:26 2017 +0200
+++ b/tests/test-checkheads-pruned-B8.t	Fri Mar 31 13:47:14 2017 +0200
@@ -65,7 +65,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  $ hg debugobsolete `getid "desc(B1)"`
+  $ hg debugobsolete --record-parents `getid "desc(B1)"`
   $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
   $ hg log -G --hidden
   @  c1f8d089020f (draft): A2
@@ -91,5 +91,5 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
+  4 new obsolescence markers
 
diff -r 446ed4c21bf6 -r 5b33df335b6c tests/test-checkheads-superceed-A8.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-checkheads-superceed-A8.t	Fri Mar 31 13:47:14 2017 +0200
@@ -0,0 +1,78 @@
+====================================
+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.
+
+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 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/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 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)"`
+  $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
+  $ 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/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
+
+
+