test-up-local-change
57 lines
| 971 B
| text/plain
|
TextLexer
/ tests / test-up-local-change
Thomas Arendsen Hein
|
r544 | #!/bin/sh | ||
mpm@selenic.com
|
r331 | |||
Thomas Arendsen Hein
|
r800 | set -e | ||
mpm@selenic.com
|
r331 | mkdir r1 | ||
cd r1 | ||||
hg init | ||||
echo a > a | ||||
hg addremove | ||||
Thomas Arendsen Hein
|
r1933 | hg commit -m "1" -d "1000000 0" | ||
mpm@selenic.com
|
r331 | |||
mpm@selenic.com
|
r485 | hg clone . ../r2 | ||
cd ../r2 | ||||
mpm@selenic.com
|
r331 | hg up | ||
echo abc > a | ||||
TK Soh
|
r949 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | ||
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | ||||
mpm@selenic.com
|
r331 | |||
cd ../r1 | ||||
echo b > b | ||||
echo a2 > a | ||||
hg addremove | ||||
Thomas Arendsen Hein
|
r1933 | hg commit -m "2" -d "1000000 0" | ||
mpm@selenic.com
|
r331 | |||
cd ../r2 | ||||
hg -q pull ../r1 | ||||
hg status | ||||
Benoit Boissinot
|
r1674 | hg parents | ||
mpm@selenic.com
|
r591 | hg --debug up | ||
Benoit Boissinot
|
r1674 | hg parents | ||
hg --debug up 0 | ||||
hg parents | ||||
Benoit Boissinot
|
r1581 | hg --debug up -m || echo failed | ||
Benoit Boissinot
|
r1674 | hg parents | ||
hg --debug up | ||||
mpm@selenic.com
|
r331 | hg parents | ||
hg -v history | ||||
TK Soh
|
r949 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | ||
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | ||||
mpm@selenic.com
|
r331 | |||
Benoit Boissinot
|
r1674 | # create a second head | ||
cd ../r1 | ||||
hg up 0 | ||||
echo b2 > b | ||||
echo a3 > a | ||||
hg addremove | ||||
Thomas Arendsen Hein
|
r1933 | hg commit -m "3" -d "1000000 0" | ||
Benoit Boissinot
|
r1674 | |||
cd ../r2 | ||||
hg -q pull ../r1 | ||||
hg status | ||||
hg parents | ||||
hg --debug up || echo failed | ||||
hg --debug up -m || echo failed | ||||
hg --debug up -f -m | ||||
hg parents | ||||
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | ||||
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | ||||