tests/test-merge10

minirst: improve layout of field lists

Before, we used the padding following the key to compute where to wrap
the text. Long keys would thus give a big indentation. It also
required careful alignment of the source text, making it cumbersome to
items to the list.

We now compute the maximum key length and use that for all items in
the list. We also put a cap on the indentation: keys longer than 10
characters are put on their own line. This is similar to how rst2html
handles large keys: it uses 14 as the cutoff point, but I felt that 10
was better for monospaced text in the console.

#!/bin/sh

# Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
# (merge correctly when all the files in a directory are moved
# but then local changes are added in the same directory)

hg init a
cd a
mkdir -p testdir
echo a > testdir/a
hg add testdir/a
hg commit -d '1000000 0' -m a
cd ..

hg clone a b
cd a
echo alpha > testdir/a
hg commit -d '1000000 0' -m remote-change
cd ..

cd b
mkdir testdir/subdir
hg mv testdir/a testdir/subdir/a
hg commit -d '1000000 0' -m move
mkdir newdir
echo beta > newdir/beta
hg add newdir/beta
hg commit -d '1000000 0' -m local-addition
hg pull ../a
hg up -C 2
hg merge
hg stat
hg diff --nodates