Show More
test-rename-merge1
25 lines
| 388 B
| text/plain
|
TextLexer
/ tests / test-rename-merge1
Matt Mackall
|
r3153 | #!/bin/sh | ||
mkdir t | ||||
cd t | ||||
hg init | ||||
Matt Mackall
|
r3251 | echo "[merge]" >> .hg/hgrc | ||
echo "followcopies = 1" >> .hg/hgrc | ||||
Matt Mackall
|
r3153 | echo foo > a | ||
echo foo > a2 | ||||
hg add a a2 | ||||
hg ci -m "start" -d "0 0" | ||||
hg mv a b | ||||
hg mv a2 b2 | ||||
hg ci -m "rename" -d "0 0" | ||||
echo "checkout" | ||||
hg co 0 | ||||
echo blahblah > a | ||||
echo blahblah > a2 | ||||
hg mv a2 c2 | ||||
hg ci -m "modify" -d "0 0" | ||||
echo "merge" | ||||
hg merge -y --debug | ||||
Matt Mackall
|
r3251 | hg status -AC | ||
Matt Mackall
|
r3153 | cat b | ||
hg ci -m "merge" -d "0 0" | ||||