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

     5

echo foo > a

     6

echo foo > b

     7

hg add a b

     8

     9

hg ci -m "test" -d "1000000 0"

    10

    11

echo blah > a

    12

    13

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

    14

    15

hg co 0

    16

    17

echo blah > b

    18

    19

hg ci -m "branch b" -d "1000000 0"

    20

HGMERGE=true hg merge 1

    21

    22

hg ci -m "merge b/a -> blah" -d "1000000 0"

    23

    24

hg co 1

    25

HGMERGE=true hg merge 2

    26

hg ci -m "merge a/b -> blah" -d "1000000 0"

    27

    28

hg log

    29

hg debugindex .hg/00changelog.i

    30

    31

echo

    32

    33

echo 1

    34

hg manifest 1

    35

echo 2

    36

hg manifest 2

    37

echo 3

    38

hg manifest 3

    39

echo 4

    40

hg manifest 4

    41

    42

echo

    43

    44

hg debugindex .hg/data/a.i

    45

    46

hg verify