tests/test-issue619
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 08 Jul 2007 19:59:02 +0200
changeset 4847 2192001e4bb4
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
Add --line-number option to hg annotate (issue506) Line numbers are separated from the last annotation element with a colon, like with many other commands, e.g. (hg) grep or compiler errors. Idea and tests by FUJIWARA Katsunori.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done