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

cat <<'EOF' > merge

     4

#!/bin/sh

     5

echo merging for `basename $1`

     6

EOF

     7

chmod +x merge

     8

HGMERGE=./merge; export HGMERGE

     9

    10

mkdir A1

    11

cd A1

    12

hg init

    13

echo This is file foo1 > foo

    14

echo This is file bar1 > bar

    15

hg add foo bar

    16

hg commit -m "commit text" -d "1000000 0"

    17

    18

cd ..

    19

hg clone A1 B1

    20

    21

cd A1

    22

rm bar

    23

hg remove bar

    24

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

    25

    26

cd ../B1

    27

echo This is file foo22 > foo

    28

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

    29

    30

cd ..

    31

hg clone A1 A2

    32

hg clone B1 B2

    33

    34

cd A1

    35

hg pull ../B1

    36

hg merge

    37

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

    38

echo bar should remain deleted.

    39

hg manifest

    40

    41

cd ../B2

    42

hg pull ../A2

    43

hg merge

    44

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

    45

echo bar should remain deleted.

    46

hg manifest