revlog: fix revlogio.packentry corner case We want to store version information about the revlog in the first entry of its index. The code in packentry was using some heuristics to detect whether this was the first entry, but these heuristics could fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from the nullid and is stored as a delta). We now give the revision number to packentry to avoid heuristics.

     1

#!/bin/sh

     2

#

     3

     4

hg init t

     5

cd t

     6

echo 1 > foo

     7

hg ci -Am m

     8

     9

cd ..

    10

hg clone t tt

    11

cd tt

    12

echo 1.1 > foo

    13

hg ci -Am m

    14

    15

cd ../t

    16

echo 1.2 > foo

    17

hg ci -Am m

    18

echo % should fail

    19

hg pull -u ../tt

    20

    21

cd ../tt

    22

echo % should fail

    23

hg pull -u ../t

    24

HGMERGE=true hg merge

    25

hg ci -mm

    26

    27

cd ../t

    28

echo % should work

    29

hg pull -u ../tt