view tests/test-excessive-merge @ 1814:7956893e8458

generate hg manpage from commands.py docstring gendoc.py is a script generating a part of the manpage (the commands help and options) from the docstring in commands.py. It avoids duplicating the doc between the doc/ directory and the docstrings. To generate the manpage, 'make doc' will create all the necessary intermediate files.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 28 Feb 2006 00:48:49 +0100
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