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

     2

     3

umask 027

     4

mkdir test1

     5

cd test1

     6

     7

hg init

     8

touch a b

     9

hg add a b

    10

hg ci -m "added a b" -d "1000000 0"

    11

    12

cd ..

    13

mkdir test2

    14

cd test2

    15

    16

hg init

    17

hg pull ../test1

    18

hg co

    19

chmod +x a

    20

hg ci -m "chmod +x a" -d "1000000 0"

    21

    22

cd ../test1

    23

echo 123 >>a

    24

hg ci -m "a updated" -d "1000000 0"

    25

    26

hg pull ../test2

    27

hg heads

    28

hg history

    29

    30

hg -v merge

    31

    32

ls -l ../test[12]/a > foo

    33

cut -b 1-10 < foo

    34