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

mkdir t

     4

cd t

     5

hg init

     6

     7

mkdir a

     8

echo foo > a/a

     9

echo bar > a/b

    10

    11

hg add a

    12

hg ci -m "0" -d "0 0"

    13

    14

hg co -C 0

    15

hg mv a b

    16

hg ci -m "1 mv a/ b/" -d "0 0"

    17

    18

hg co -C 0

    19

echo baz > a/c

    20

hg add a/c

    21

hg ci -m "2 add a/c" -d "0 0"

    22

    23

hg merge --debug 1

    24

echo a/* b/*

    25

hg st -C

    26

hg ci -m "3 merge 2+1" -d "0 0"

    27

hg debugrename b/c

    28

    29

hg co -C 1

    30

hg merge --debug 2

    31

echo a/* b/*

    32

hg st -C

    33

hg ci -m "4 merge 1+2" -d "0 0"

    34

hg debugrename b/c