view tests/test-excessive-merge @ 5459:b0e5f44fdeb3

mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t. See also PEP 353. NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Fri, 12 Oct 2007 11:46:49 +0900
parents c0b449154a90
children
line wrap: on
line source

#!/bin/sh

hg init

echo foo > a
echo foo > b
hg add a b

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

echo blah > a

hg ci -m "branch a" -d "1000000 0"

hg co 0

echo blah > b

hg ci -m "branch b" -d "1000000 0"
HGMERGE=true hg merge 1

hg ci -m "merge b/a -> blah" -d "1000000 0"

hg co 1
HGMERGE=true hg merge 2
hg ci -m "merge a/b -> blah" -d "1000000 0"

hg log
hg debugindex .hg/store/00changelog.i

echo

echo 1
hg manifest --debug 1
echo 2
hg manifest --debug 2
echo 3
hg manifest --debug 3
echo 4
hg manifest --debug 4

echo

hg debugindex .hg/store/data/a.i

hg verify