Show More
@@ -1,4 +1,4 b'' | |||
|
1 |
#!/bin/sh |
|
|
1 | #!/bin/sh | |
|
2 | 2 | |
|
3 | 3 | hg clone http://localhost:20059/ copy |
|
4 | 4 | echo $? |
@@ -17,12 +17,9 b' signal.signal(signal.SIGTERM, lambda x: ' | |||
|
17 | 17 | run() |
|
18 | 18 | EOF |
|
19 | 19 | |
|
20 | set +x # backgrounding sometimes disturbs the order of command tracing | |
|
21 | 20 | python dumb.py 2>/dev/null & |
|
22 | set -x | |
|
23 | 21 | |
|
24 | 22 | hg clone http://localhost:20059/foo copy2 |
|
25 | 23 | echo $? |
|
26 | 24 | |
|
27 | set +x | |
|
28 | 25 | kill $! |
@@ -1,6 +1,5 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | set -x | |
|
4 | 3 | hg init |
|
5 | 4 | echo "nothing" > a |
|
6 | 5 | hg add a |
@@ -10,7 +9,7 b' hg commit -m branch1 -d "0 0"' | |||
|
10 | 9 | hg co 0 |
|
11 | 10 | echo "something else" > a |
|
12 | 11 | hg commit -m branch2 -d "0 0" |
|
13 | export HGMERGE=merge | |
|
12 | HGMERGE=merge; export HGMERGE | |
|
14 | 13 | hg up -m 1 |
|
15 | 14 | hg id |
|
16 | 15 | grep -Ev ">>>|<<<" a |
@@ -1,6 +1,5 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | set -x | |
|
4 | 3 | hg init |
|
5 | 4 | echo a > a |
|
6 | 5 | hg add a |
@@ -12,7 +11,7 b' hg status' | |||
|
12 | 11 | hg --debug commit -m "2" -d "0 0" |
|
13 | 12 | hg history |
|
14 | 13 | hg log a |
|
15 |
|
|
|
14 | md5sum .hg/data/b.d | |
|
16 | 15 | hg cat b > bsum |
|
17 | 16 | md5sum bsum |
|
18 | 17 | hg cat a > asum |
@@ -7,6 +7,6 b' hg ci -m "a" -d "0 0"' | |||
|
7 | 7 | |
|
8 | 8 | echo 123 > b |
|
9 | 9 | hg add b |
|
10 |
hg diff | sed "s/\(\(---\|+++\) [ |
|
|
10 | hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" | |
|
11 | 11 | |
|
12 |
hg diff -r tip | sed "s/\(\(---\|+++\) [ |
|
|
12 | hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" |
@@ -1,4 +1,4 b'' | |||
|
1 |
#!/bin/sh |
|
|
1 | #!/bin/sh | |
|
2 | 2 | |
|
3 | 3 | mkdir t |
|
4 | 4 | cd t |
@@ -26,7 +26,7 b' hg id' | |||
|
26 | 26 | hg update -C 0 |
|
27 | 27 | echo "changed file1 different" >> file1 |
|
28 | 28 | HGMERGE=merge hg update |
|
29 |
hg diff | sed -e "s/\(\(---\|+++\).*\) |
|
|
29 | hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" | |
|
30 | 30 | hg status |
|
31 | 31 | hg id |
|
32 | 32 | hg revert |
@@ -1,11 +1,11 b'' | |||
|
1 |
#!/bin/sh |
|
|
1 | #!/bin/sh | |
|
2 | 2 | |
|
3 | 3 | cat <<'EOF' > merge |
|
4 | 4 | #!/bin/sh |
|
5 | 5 | echo merging for `basename $1` |
|
6 | 6 | EOF |
|
7 | 7 | chmod +x merge |
|
8 | export HGMERGE=./merge | |
|
8 | HGMERGE=./merge; export HGMERGE | |
|
9 | 9 | |
|
10 | 10 | mkdir A1 |
|
11 | 11 | cd A1 |
@@ -1,4 +1,4 b'' | |||
|
1 |
#!/bin/sh |
|
|
1 | #!/bin/sh | |
|
2 | 2 | hg --debug init |
|
3 | 3 | echo this is a1 > a |
|
4 | 4 | hg add a |
@@ -1,6 +1,6 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 |
set -e |
|
|
3 | set -e | |
|
4 | 4 | mkdir r1 |
|
5 | 5 | cd r1 |
|
6 | 6 | hg init |
@@ -13,7 +13,7 b' cd ../r2' | |||
|
13 | 13 | hg up |
|
14 | 14 | echo abc > a |
|
15 | 15 | hg diff > ../d |
|
16 |
sed "s/\(\(---\|+++\) [ |
|
|
16 | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d | |
|
17 | 17 | |
|
18 | 18 | cd ../r1 |
|
19 | 19 | echo b > b |
@@ -29,5 +29,5 b' hg --debug up -m' | |||
|
29 | 29 | hg parents |
|
30 | 30 | hg -v history |
|
31 | 31 | hg diff > ../d |
|
32 |
sed "s/\(\(---\|+++\) [ |
|
|
32 | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d | |
|
33 | 33 |
General Comments 0
You need to be logged in to leave comments.
Login now