test-issue612
24 lines
| 198 B
| text/plain
|
TextLexer
/ tests / test-issue612
|
r4819 | #!/bin/sh | ||
mkdir t | ||||
cd t | ||||
hg init | ||||
mkdir src | ||||
echo a > src/a.c | ||||
|
r12156 | hg ci -Ama | ||
|
r4819 | |||
hg mv src source | ||||
|
r12156 | hg ci -Ammove | ||
|
r4819 | |||
hg co -C 0 | ||||
echo new > src/a.c | ||||
echo compiled > src/a.o | ||||
|
r12156 | hg ci -mupdate | ||
|
r4819 | |||
hg st | ||||
hg merge | ||||
hg st | ||||