extend network protocol to stop clients from locking servers now all repositories have capabilities slot, tuple with list of names. if 'unbundle' capability present, repo supports push where client does not need to lock server. repository classes that have unbundle capability also have unbundle method. implemented for ssh now, will be base for push over http. unbundle protocol acts this way. server tells client what heads it has during normal negotiate step. client starts unbundle by repeat server's heads back to it. if server has new heads, abort immediately. otherwise, transfer changes to server. once data transferred, server locks and checks heads again. if heads same, changes can be added. else someone else added heads, and server aborts. if client wants to force server to add heads, sends special heads list of 'force'.

     1

#!/bin/sh

     2

     3

hg init

     4

touch a

     5

hg add a

     6

hg commit -m "Added a" -d "1000000 0"

     7

     8

touch main

     9

hg add main

    10

hg commit -m "Added main" -d "1000000 0"

    11

hg checkout 0

    12

    13

echo Main should be gone

    14

ls

    15

    16

touch side1

    17

hg add side1

    18

hg commit -m "Added side1" -d "1000000 0"

    19

touch side2

    20

hg add side2

    21

hg commit -m "Added side2" -d "1000000 0"

    22

    23

hg log

    24

    25

echo Should have two heads, side2 and main

    26

hg heads

    27

    28

echo Should show "a side1 side2"

    29

ls

    30

    31

hg update --debug -C 1

    32

echo Should only show "a main"

    33

ls

    34