view tests/test-confused-revert @ 9051:f8e25885d975

commands: wrapped docstrings at 78 characters We have always had a left margin of 4 characters -- probably just because that's how docstrings for top-level functions turn out by default, but it also looks nice in the built-in help. The docstrings were wrapped at 70 characters, which is the default for Emacs. However, this gives a right margin of 10 characters in a standard 80 character terminal. I've now wrapped the relevant docstrings at 78 characters, effectively killing the right margin. The asymmetric margins looked a bit odd and some of the text looked cramped with a right margin, so Dirkjan and I felt that it was best to remove it entirely. The two character gap was kept to have some space between the border of the terminal -- it will also make diffs involving the docstrings fit in a 80 character line.
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Jul 2009 23:54:30 +0200
parents 890e285c52a1
children 4c94b6d0fb1c
line wrap: on
line source

#!/bin/sh

hg init
echo foo > a
hg add a
hg commit -m "1" -d "1000000 0"

echo bar > b
hg add b
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "reverting..."
hg revert --all

echo "%%% should show b unknown and a back to normal"
hg status

rm b

hg co -C 0
echo foo-a > a
hg commit -m "2a" -d "1000000 0"

hg co -C 0
echo foo-b > a
hg commit -m "2b" -d "1000000 0"

HGMERGE=true hg merge 1

echo "%%% should show foo-b"
cat a

echo bar > b
hg add b
rm a
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "%%% revert should fail"
hg revert --all

echo "%%% revert should be ok now"
hg revert -r2 --all

echo "%%% should show b unknown and a marked modified (merged)"
hg status

echo "%%% should show foo-b"
cat a