====================================

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.

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 (glob)

  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 (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

  obsoleted 2 changesets

  $ cd ../..