test-issue619
20 lines
| 203 B
| text/plain
|
TextLexer
/ tests / test-issue619
|
r4748 | #!/bin/sh | ||
mkdir t | ||||
cd t | ||||
hg init | ||||
echo a > a | ||||
|
r12156 | hg ci -Ama | ||
|
r4748 | echo b > b | ||
hg branch b | ||||
|
r12156 | hg ci -Amb | ||
|
r4748 | hg co -C 0 | ||
echo fast-forward | ||||
hg merge b | ||||
|
r12156 | hg ci -Ammerge | ||
|
r4748 | |||
echo bogus fast-forward should fail | ||||
hg merge b | ||||
echo done | ||||