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