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

     2 Testing head checking code: Case C-2

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

     4 

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

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

     7 some of the new one we push.

     8 

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

    10 

    11 Category C: case were the branch is only partially obsoleted

    12 TestCase 2: 2 changeset branch, only the base is rewritten

    13 

    14 .. old-state:

    15 ..

    16 .. * 2 changeset branch

    17 ..

    18 .. new-state:

    19 ..

    20 .. * 1 new changesets branches superceeding only the base of the old one

    21 .. * The old branch is still alive (base is obsolete, head is alive)

    22 ..

    23 .. expected-result:

    24 ..

    25 .. * push denied

    26 ..

    27 .. graph-summary:

    28 ..

    29 ..   B ○

    30 ..     |

    31 ..   A ø⇠◔ A'

    32 ..     |/

    33 ..     ●

    34 

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

    36 

    37 Test setup

    38 ----------

    39 

    40   $ mkdir C2

    41   $ cd C2

    42   $ setuprepos

    43   creating basic server and client repo

    44   updating to branch default

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

    46   $ cd server

    47   $ mkcommit B0

    48   $ cd ../client

    49   $ hg pull

    50   pulling from $TESTTMP/C2/server (glob)

    51   searching for changes

    52   adding changesets

    53   adding manifests

    54   adding file changes

    55   added 1 changesets with 1 changes to 1 files

    56   (run 'hg update' to get a working copy)

    57   $ hg up 0

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

    59   $ mkcommit A1

    60   created new head

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

    62   $ hg log -G --hidden

    63   @  f6082bc4ffef (draft): A1

    64   |

    65   | o  d73caddc5533 (draft): B0

    66   | |

    67   | x  8aaa48160adc (draft): A0

    68   |/

    69   o  1e4be0697311 (public): root

    70   

    71 

    72 Actual testing

    73 --------------

    74 

    75   $ hg push --rev 'desc(A1)'

    76   pushing to $TESTTMP/C2/server (glob)

    77   searching for changes

    78   abort: push creates new remote head f6082bc4ffef!

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

    80   [255]

    81 

    82   $ cd ../..