Fix hg push and hg push -r sometimes creating new heads without --force. Fixing issue179. The algorithm checks if there not more new heads on the remote side than heads which become non-heads due to getting children. Pushing this repo: m /\ 3 3a| |/ / 2 2a |/ 1 to a repo only having 1, 2 and 3 didn't abort requiring --force before. Added test cases for this and some doc strings for used methods.

     1

#!/bin/sh

     2

     3

mkdir a

     4

cd a

     5

hg init

     6

echo foo > t1

     7

hg add t1

     8

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

     9

    10

cd ..

    11

hg clone a b

    12

    13

cd a

    14

echo foo > t2

    15

hg add t2

    16

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

    17

    18

cd ../b

    19

echo foo > t3

    20

hg add t3

    21

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

    22

    23

hg push ../a

    24

hg pull ../a

    25

hg push ../a

    26

hg up -m

    27

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

    28

hg push ../a

    29

cd ..

    30

    31

hg init c

    32

cd c

    33

for i in 0 1 2; do

    34

    echo $i >> foo

    35

    hg ci -Am $i -d "1000000 0"

    36

done

    37

cd ..

    38

    39

hg clone c d

    40

cd d

    41

for i in 0 1; do

    42

    hg co -C $i

    43

    echo d-$i >> foo

    44

    hg ci -m d-$i -d "1000000 0"

    45

done

    46

    47

HGMERGE=true hg co -m 3

    48

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

    49

    50

hg push ../c

    51

hg push -r 2 ../c

    52

hg push -r 3 -r 4 ../c

    53

hg push -r 5 ../c

    54

    55

exit 0