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

Testing head checking code: Case E-3

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

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 E: case involving changeset on multiple branch

TestCase 8: moving only part of the interleaved branch away, creating 2 heads

.. old-state:

..

.. * 2-changeset on branch default

.. * 1-changeset on topic Z (between the two other)

..

.. new-state:

..

.. * 2-changeset on branch default, on untouched, the other moved

.. * 1-changeset on topic Z (at the same location)

..

.. expected-result:

..

.. * push rejected

..

.. graph-summary:

..

..   C ø⇠◔ C' branch default

..     | |

..   B ◔ |    topic Z

..     | |

..   A ◔ |    branch default

..     |/

..     ●

  $ . $TESTDIR/testlib/topic_setup.sh

  $ . $TESTDIR/testlib/push-checkheads-util.sh

Test setup

----------

  $ mkdir E1

  $ cd E1

  $ 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 topic Z

  marked working directory as topic: Z

  $ mkcommit B0

  active topic 'Z' grew its first changeset

  (see 'hg help topics' for more information)

  $ hg topic --clear

  $ mkcommit C0

  created new head

  (consider using topic for lightweight branches. See 'hg help topic')

  $ hg push

  pushing to $TESTTMP/E1/server

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 2 changesets with 2 changes to 2 files

  $ hg up 0

  0 files updated, 0 files merged, 3 files removed, 0 files unresolved

  $ mkcommit C1

  created new head

  (consider using topic for lightweight branches. See 'hg help topic')

  $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"`

  1 new obsolescence markers

  obsoleted 1 changesets

  $ hg log -G --hidden

  @  dc44c53142f0 (draft): C1

  |

  | x  44759c6d327d (draft): C0

  | |

  | o  35d2f30a8ba4 (draft)[Z]: B0

  | |

  | o  8aaa48160adc (draft): A0

  |/

  o  1e4be0697311 (public): root

Actual testing

--------------

  $ hg push -r 'desc("C1")'

  pushing to $TESTTMP/E1/server

  searching for changes

  abort: push creates new remote head dc44c53142f0!

  (merge or see 'hg help push' for details about pushing new heads)

  [255]

  $ cd ../..