test-up-local-change
35 lines
| 455 B
| text/plain
|
TextLexer
/ tests / test-up-local-change
|
r544 | #!/bin/sh | ||
|
r331 | |||
export HGMERGE=true | ||||
set -ex | ||||
mkdir r1 | ||||
cd r1 | ||||
hg init | ||||
echo a > a | ||||
hg addremove | ||||
hg commit -t "1" -u test -d "0 0" | ||||
|
r485 | hg clone . ../r2 | ||
cd ../r2 | ||||
|
r331 | hg up | ||
echo abc > a | ||||
|
r332 | hg diff > ../d | ||
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | ||||
|
r331 | |||
cd ../r1 | ||||
echo b > b | ||||
echo a2 > a | ||||
hg addremove | ||||
hg commit -t "2" -u test -d "0 0" | ||||
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 | ||
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | ||||
|
r331 | |||