tests/test-issue619
author Greg Ward <greg-hg@gerg.ca>
Tue, 09 Mar 2010 21:53:16 -0500
changeset 10636 23ab3b05bd66
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
rebase: improve help text - add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options

#!/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