view tests/test-excessive-merge @ 1914:a5bf0030df5f

make --style=compact look for map-cmdline.compact. change name of key in map file from changelog to changeset. rename command map files to start with map-cmdline. rename ui.logmap to ui.style in hgrc. now --style=foo does this: tries to open foo as file. tries as map-cmdline.foo in template path. tries as foo in template path.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 04 Mar 2006 15:15:18 -0800
parents ef8cd889a78b
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init

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

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

echo blah > a

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

hg co 0

echo blah > b

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

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

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

hg log
hg debugindex .hg/00changelog.i

echo

echo 1
hg manifest 1
echo 2
hg manifest 2
echo 3
hg manifest 3
echo 4
hg manifest 4

echo

hg debugindex .hg/data/a.i

hg verify