1 ====================================

     2 Testing head checking code: Case A-1

     3 ====================================

     4 

     5 Mercurial checks for the introduction of multiple heads on push. Evolution

     6 comes into play to detect if existing heads on the server are being replaced by

     7 some of the new heads we push.

     8 

     9 This test file is part of a series of tests checking this behavior.

    10 

    11 Category A: checking simple case invoving a branch being superceeded by another.

    12 TestCase 1: single-changeset branch

    13 

    14 .. old-state:

    15 ..

    16 .. * 1 changeset branch

    17 ..

    18 .. new-state:

    19 ..

    20 .. * 1 changeset branch succeeding to A

    21 ..

    22 .. expected-result:

    23 ..

    24 .. * push allowed

    25 ..

    26 .. graph-summary:

    27 ..

    28 ..   A ø⇠◔ A'

    29 ..     |/

    30 ..     ○

    31 

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

    33 

    34 Test setup

    35 ----------

    36 

    37   $ setuprepos

    38   creating basic server and client repo

    39   updating to branch default

    40   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    41   $ cd client

    42   $ hg up 0

    43   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    44   $ mkcommit A1

    45   created new head

    46   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`

    47   $ hg log -G --hidden

    48   @  f6082bc4ffef (draft): A1

    49   |

    50   | x  8aaa48160adc (draft): A0

    51   |/

    52   o  1e4be0697311 (public): root

    53   

    54 

    55 Actual testing

    56 --------------

    57 

    58   $ hg push

    59   pushing to $TESTTMP/server

    60   searching for changes

    61   adding changesets

    62   adding manifests

    63   adding file changes

    64   added 1 changesets with 1 changes to 1 files (+1 heads)

    65   1 new obsolescence markers

    66 

    67 

    68