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