2005-07-01 10:22:27 +04:00
|
|
|
#!/bin/sh
|
2005-06-15 01:28:42 +04:00
|
|
|
|
|
|
|
set -ex
|
|
|
|
mkdir r1
|
|
|
|
cd r1
|
|
|
|
hg init
|
|
|
|
echo a > a
|
|
|
|
hg addremove
|
2005-07-22 00:05:17 +04:00
|
|
|
hg commit -m "1" -d "0 0"
|
2005-06-15 01:28:42 +04:00
|
|
|
|
2005-06-27 03:20:46 +04:00
|
|
|
hg clone . ../r2
|
|
|
|
cd ../r2
|
2005-06-15 01:28:42 +04:00
|
|
|
hg up
|
|
|
|
echo abc > a
|
2005-06-15 01:44:37 +04:00
|
|
|
hg diff > ../d
|
2005-07-27 07:03:45 +04:00
|
|
|
sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
|
2005-06-15 01:28:42 +04:00
|
|
|
|
|
|
|
cd ../r1
|
|
|
|
echo b > b
|
|
|
|
echo a2 > a
|
|
|
|
hg addremove
|
2005-07-22 00:05:17 +04:00
|
|
|
hg commit -m "2" -d "0 0"
|
2005-06-15 01:28:42 +04:00
|
|
|
|
|
|
|
cd ../r2
|
|
|
|
hg -q pull ../r1
|
|
|
|
hg status
|
2005-07-03 10:54:35 +04:00
|
|
|
hg --debug up
|
|
|
|
hg --debug up -m
|
2005-06-15 01:28:42 +04:00
|
|
|
hg parents
|
|
|
|
hg -v history
|
2005-06-15 01:44:37 +04:00
|
|
|
hg diff > ../d
|
2005-07-27 07:03:45 +04:00
|
|
|
sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
|
2005-06-15 01:28:42 +04:00
|
|
|
|