test-up-local-change
33 lines
| 436 B
| text/plain
|
TextLexer
/ tests / test-up-local-change
|
r544 | #!/bin/sh | ||
|
r331 | |||
set -ex | ||||
mkdir r1 | ||||
cd r1 | ||||
hg init | ||||
echo a > a | ||||
hg addremove | ||||
|
r749 | hg commit -m "1" -d "0 0" | ||
|
r331 | |||
|
r485 | hg clone . ../r2 | ||
cd ../r2 | ||||
|
r331 | hg up | ||
echo abc > a | ||||
|
r332 | hg diff > ../d | ||
|
r774 | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d | ||
|
r331 | |||
cd ../r1 | ||||
echo b > b | ||||
echo a2 > a | ||||
hg addremove | ||||
|
r749 | hg commit -m "2" -d "0 0" | ||
|
r331 | |||
cd ../r2 | ||||
hg -q pull ../r1 | ||||
hg status | ||||
|
r591 | hg --debug up | ||
hg --debug up -m | ||||
|
r331 | hg parents | ||
hg -v history | ||||
|
r332 | hg diff > ../d | ||
|
r774 | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d | ||
|
r331 | |||