Change the size of the short hash representation -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Change the size of the short hash representation First note that this number doesn't really matter, as we always check for ambiguous short hash ids. Here's the math on collision probability: >>> import math >>> def p(f, n): return 1 - (1 / math.exp(n**2/(2*f))) ... >>> p(2**32, 30000.0) 0.09947179164613551 # with 30000 changesets (BKCVS), we have a 9% chance >>> p(2**32, 65000.0) 0.38850881217977273 # and with a full import from BK, we'd have a 39% chance >>> p(2**40, 1e6) 0.36539171908447321 # we'd like to be "safe" for 1M csets, so 40 isn't enough >>> p(2**48, 1e6) 0.001774780051374103 # But 48 looks good >>> p(2**48, 1e7) 0.16275260939624481 >>> p(2**48, 5e6) 0.043437281083569146 >>> p(2**48, 2e6) 0.0070802434913129764 >>> p(2**48, 3e6) 0.01586009440574343 manifest hash: 24d9f928a463f46708b0e11fb781d5a241851424 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQoMywK+sNU5EO8RAoBBAJwII9GV6dT9QUOYAk3gZGw9z0JvjACfSI4q IFnTu1F7P5OuLelO1GsM8Bs= =CNWk -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

     3

export HGMERGE=true

     4

     5

set -ex

     6

mkdir r1

     7

cd r1

     8

hg init

     9

echo a > a

    10

hg addremove

    11

hg commit -t "1" -u test -d "0 0"

    12

    13

cd ..

    14

mkdir r2

    15

cd r2

    16

hg init ../r1

    17

hg up

    18

echo abc > a

    19

hg diff > ../d

    20

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    21

    22

cd ../r1

    23

echo b > b

    24

echo a2 > a

    25

hg addremove

    26

hg commit -t "2" -u test -d "0 0"

    27

    28

cd ../r2

    29

hg -q pull ../r1

    30

hg status

    31

hg -d up

    32

hg -d up -m

    33

hg parents

    34

hg -v history

    35

hg diff > ../d

    36

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    37