Show More
@@ -38,7 +38,7 b' hg --cwd empty pull ../full.hg' | |||||
38 | hg -R empty rollback |
|
38 | hg -R empty rollback | |
39 | hg --cwd empty pull ../full.hg |
|
39 | hg --cwd empty pull ../full.hg | |
40 |
|
40 | |||
41 |
rm -r |
|
41 | rm -r empty | |
42 | hg init empty |
|
42 | hg init empty | |
43 | cd empty |
|
43 | cd empty | |
44 | hg -R bundle://../full.hg log |
|
44 | hg -R bundle://../full.hg log | |
@@ -49,7 +49,7 b" echo 'changegroup = echo changegroup: u=" | |||||
49 | hg pull bundle://../full.hg |
|
49 | hg pull bundle://../full.hg | |
50 | cd .. |
|
50 | cd .. | |
51 |
|
51 | |||
52 |
rm -r |
|
52 | rm -r empty | |
53 | hg init empty |
|
53 | hg init empty | |
54 | hg clone -r 3 test partial |
|
54 | hg clone -r 3 test partial | |
55 | hg clone partial partial2 |
|
55 | hg clone partial partial2 |
@@ -23,7 +23,7 b' hg clone . ../a' | |||||
23 | echo $? |
|
23 | echo $? | |
24 | cd .. |
|
24 | cd .. | |
25 | chmod 700 a |
|
25 | chmod 700 a | |
26 |
rm -r |
|
26 | rm -r a b | |
27 |
|
27 | |||
28 | # Source of wrong type |
|
28 | # Source of wrong type | |
29 | mkfifo a |
|
29 | mkfifo a |
@@ -61,7 +61,7 b" echo 'changeset = q' >> t" | |||||
61 | hg log --style ./t |
|
61 | hg log --style ./t | |
62 |
|
62 | |||
63 | echo '# include works' |
|
63 | echo '# include works' | |
64 |
rm |
|
64 | rm q | |
65 | echo '{rev}' > q |
|
65 | echo '{rev}' > q | |
66 | hg log --style ./t |
|
66 | hg log --style ./t | |
67 |
|
67 |
@@ -18,30 +18,30 b' echo % message should be same' | |||||
18 | hg --cwd b tip | grep 'second change' |
|
18 | hg --cwd b tip | grep 'second change' | |
19 | echo % committer should be same |
|
19 | echo % committer should be same | |
20 | hg --cwd b tip | grep someone |
|
20 | hg --cwd b tip | grep someone | |
21 |
rm -r |
|
21 | rm -r b | |
22 |
|
22 | |||
23 | echo % import of plain diff should fail without message |
|
23 | echo % import of plain diff should fail without message | |
24 | hg clone -r0 a b |
|
24 | hg clone -r0 a b | |
25 | hg --cwd a diff -r0:1 > tip.patch |
|
25 | hg --cwd a diff -r0:1 > tip.patch | |
26 | hg --cwd b import ../tip.patch |
|
26 | hg --cwd b import ../tip.patch | |
27 |
rm -r |
|
27 | rm -r b | |
28 |
|
28 | |||
29 | echo % import of plain diff should be ok with message |
|
29 | echo % import of plain diff should be ok with message | |
30 | hg clone -r0 a b |
|
30 | hg clone -r0 a b | |
31 | hg --cwd a diff -r0:1 > tip.patch |
|
31 | hg --cwd a diff -r0:1 > tip.patch | |
32 | hg --cwd b import -mpatch ../tip.patch |
|
32 | hg --cwd b import -mpatch ../tip.patch | |
33 |
rm -r |
|
33 | rm -r b | |
34 |
|
34 | |||
35 | echo % import from stdin |
|
35 | echo % import from stdin | |
36 | hg clone -r0 a b |
|
36 | hg clone -r0 a b | |
37 | hg --cwd a export tip | hg --cwd b import - |
|
37 | hg --cwd a export tip | hg --cwd b import - | |
38 |
rm -r |
|
38 | rm -r b | |
39 |
|
39 | |||
40 | echo % override commit message |
|
40 | echo % override commit message | |
41 | hg clone -r0 a b |
|
41 | hg clone -r0 a b | |
42 | hg --cwd a export tip | hg --cwd b import -m 'override' - |
|
42 | hg --cwd a export tip | hg --cwd b import -m 'override' - | |
43 | hg --cwd b tip | grep override |
|
43 | hg --cwd b tip | grep override | |
44 |
rm -r |
|
44 | rm -r b | |
45 |
|
45 | |||
46 | cat > mkmsg.py <<EOF |
|
46 | cat > mkmsg.py <<EOF | |
47 | import email.Message, sys |
|
47 | import email.Message, sys | |
@@ -58,29 +58,29 b' hg --cwd a diff -r0:1 > tip.patch' | |||||
58 | python mkmsg.py > msg.patch |
|
58 | python mkmsg.py > msg.patch | |
59 | hg --cwd b import ../msg.patch |
|
59 | hg --cwd b import ../msg.patch | |
60 | hg --cwd b tip | grep email |
|
60 | hg --cwd b tip | grep email | |
61 |
rm -r |
|
61 | rm -r b | |
62 |
|
62 | |||
63 | echo % plain diff in email, no subject, message body |
|
63 | echo % plain diff in email, no subject, message body | |
64 | hg clone -r0 a b |
|
64 | hg clone -r0 a b | |
65 | grep -v '^Subject:' msg.patch | hg --cwd b import - |
|
65 | grep -v '^Subject:' msg.patch | hg --cwd b import - | |
66 |
rm -r |
|
66 | rm -r b | |
67 |
|
67 | |||
68 | echo % plain diff in email, subject, no message body |
|
68 | echo % plain diff in email, subject, no message body | |
69 | hg clone -r0 a b |
|
69 | hg clone -r0 a b | |
70 | grep -v '^email ' msg.patch | hg --cwd b import - |
|
70 | grep -v '^email ' msg.patch | hg --cwd b import - | |
71 |
rm -r |
|
71 | rm -r b | |
72 |
|
72 | |||
73 | echo % plain diff in email, no subject, no message body, should fail |
|
73 | echo % plain diff in email, no subject, no message body, should fail | |
74 | hg clone -r0 a b |
|
74 | hg clone -r0 a b | |
75 | egrep -v '^(Subject|email)' msg.patch | hg --cwd b import - |
|
75 | egrep -v '^(Subject|email)' msg.patch | hg --cwd b import - | |
76 |
rm -r |
|
76 | rm -r b | |
77 |
|
77 | |||
78 | echo % hg export in email, should use patch header |
|
78 | echo % hg export in email, should use patch header | |
79 | hg clone -r0 a b |
|
79 | hg clone -r0 a b | |
80 | hg --cwd a export tip > tip.patch |
|
80 | hg --cwd a export tip > tip.patch | |
81 | python mkmsg.py | hg --cwd b import - |
|
81 | python mkmsg.py | hg --cwd b import - | |
82 | hg --cwd b tip | grep second |
|
82 | hg --cwd b tip | grep second | |
83 |
rm -r |
|
83 | rm -r b | |
84 |
|
84 | |||
85 | # bug non regression test |
|
85 | # bug non regression test | |
86 | # importing a patch in a subdirectory failed at the commit stage |
|
86 | # importing a patch in a subdirectory failed at the commit stage |
@@ -32,7 +32,7 b' hg -R temp2 unbundle test2.hg' | |||||
32 | hg -R temp tip |
|
32 | hg -R temp tip | |
33 | hg -R temp2 tip |
|
33 | hg -R temp2 tip | |
34 |
|
34 | |||
35 |
rm -r |
|
35 | rm -r temp temp2 new | |
36 |
|
36 | |||
37 | # test outgoing |
|
37 | # test outgoing | |
38 | hg clone test test-dev |
|
38 | hg clone test test-dev |
@@ -24,7 +24,7 b' mkdir a' | |||||
24 | echo a > a/a |
|
24 | echo a > a/a | |
25 | hg commit -Ama |
|
25 | hg commit -Ama | |
26 |
|
26 | |||
27 |
rm -r |
|
27 | rm -r a | |
28 | echo a > a |
|
28 | echo a > a | |
29 |
|
29 | |||
30 | echo % should fail - would corrupt dirstate |
|
30 | echo % should fail - would corrupt dirstate | |
@@ -40,7 +40,7 b' mkdir b' | |||||
40 | mkdir b/c |
|
40 | mkdir b/c | |
41 | echo a > b/c/d |
|
41 | echo a > b/c/d | |
42 | hg commit -Ama |
|
42 | hg commit -Ama | |
43 |
rm -r |
|
43 | rm -r b | |
44 | echo a > b |
|
44 | echo a > b | |
45 |
|
45 | |||
46 | echo % should fail - would corrupt dirstate |
|
46 | echo % should fail - would corrupt dirstate |
@@ -27,5 +27,5 b' hg locate' | |||||
27 | hg locate -I ../t |
|
27 | hg locate -I ../t | |
28 | # test issue294 |
|
28 | # test issue294 | |
29 | cd .. |
|
29 | cd .. | |
30 |
rm -r |
|
30 | rm -r t | |
31 | hg locate t |
|
31 | hg locate t |
@@ -30,5 +30,5 b' hg pull -q' | |||||
30 | hg merge |
|
30 | hg merge | |
31 |
|
31 | |||
32 | echo % revert to changeset 1 to simulate a failed merge |
|
32 | echo % revert to changeset 1 to simulate a failed merge | |
33 |
rm |
|
33 | rm alpha beta gamma | |
34 | hg up -C 1 |
|
34 | hg up -C 1 |
@@ -41,5 +41,4 b' hg update -C' | |||||
41 | hg diff |
|
41 | hg diff | |
42 | hg status |
|
42 | hg status | |
43 | hg id |
|
43 | hg id | |
44 | cd ..; /bin/rm -rf t |
|
|||
45 |
|
44 |
@@ -42,5 +42,4 b' hg update -C' | |||||
42 | hg diff |
|
42 | hg diff | |
43 | hg status |
|
43 | hg status | |
44 | hg id |
|
44 | hg id | |
45 | cd ..; /bin/rm -rf t |
|
|||
46 |
|
45 |
@@ -25,7 +25,7 b' echo %% no merges expected' | |||||
25 | env HGMERGE=../merge hg merge 1 |
|
25 | env HGMERGE=../merge hg merge 1 | |
26 | hg diff --nodates |
|
26 | hg diff --nodates | |
27 | hg status |
|
27 | hg status | |
28 |
cd ..; |
|
28 | cd ..; rm -r t | |
29 |
|
29 | |||
30 | mkdir t |
|
30 | mkdir t | |
31 | cd t |
|
31 | cd t | |
@@ -48,7 +48,7 b' echo %% merge of b expected' | |||||
48 | env HGMERGE=../merge hg merge -f 1 |
|
48 | env HGMERGE=../merge hg merge -f 1 | |
49 | hg diff --nodates |
|
49 | hg diff --nodates | |
50 | hg status |
|
50 | hg status | |
51 |
cd ..; |
|
51 | cd ..; rm -r t | |
52 | echo %% |
|
52 | echo %% | |
53 |
|
53 | |||
54 | mkdir t |
|
54 | mkdir t | |
@@ -77,7 +77,7 b' echo %% merge expected!' | |||||
77 | env HGMERGE=../merge hg merge -f 2 |
|
77 | env HGMERGE=../merge hg merge -f 2 | |
78 | hg diff --nodates |
|
78 | hg diff --nodates | |
79 | hg status |
|
79 | hg status | |
80 |
cd ..; |
|
80 | cd ..; rm -r t | |
81 |
|
81 | |||
82 | mkdir t |
|
82 | mkdir t | |
83 | cd t |
|
83 | cd t | |
@@ -101,4 +101,3 b' echo %% merge of b expected' | |||||
101 | env HGMERGE=../merge hg merge -f 2 |
|
101 | env HGMERGE=../merge hg merge -f 2 | |
102 | hg diff --nodates |
|
102 | hg diff --nodates | |
103 | hg status |
|
103 | hg status | |
104 | cd ..; /bin/rm -rf t |
|
@@ -14,7 +14,7 b' hg update 0' | |||||
14 | echo This is file b2 > b |
|
14 | echo This is file b2 > b | |
15 | hg add b |
|
15 | hg add b | |
16 | hg commit -m "commit #2" -d "1000000 0" |
|
16 | hg commit -m "commit #2" -d "1000000 0" | |
17 |
cd ..; |
|
17 | cd ..; rm -r t | |
18 |
|
18 | |||
19 | mkdir t |
|
19 | mkdir t | |
20 | cd t |
|
20 | cd t | |
@@ -29,7 +29,7 b' rm b' | |||||
29 | hg update 0 |
|
29 | hg update 0 | |
30 | echo This is file b2 > b |
|
30 | echo This is file b2 > b | |
31 | hg commit -A -m "commit #2" -d "1000000 0" |
|
31 | hg commit -A -m "commit #2" -d "1000000 0" | |
32 |
cd ..; |
|
32 | cd ..; rm -r t | |
33 |
|
33 | |||
34 | mkdir t |
|
34 | mkdir t | |
35 | cd t |
|
35 | cd t | |
@@ -45,4 +45,3 b' hg remove b' | |||||
45 | hg update 0 |
|
45 | hg update 0 | |
46 | echo This is file b2 > b |
|
46 | echo This is file b2 > b | |
47 | hg commit -A -m "commit #2" -d "1000000 0" |
|
47 | hg commit -A -m "commit #2" -d "1000000 0" | |
48 | cd ..; /bin/rm -rf t |
|
@@ -61,7 +61,7 b' show_branch_cache 1' | |||||
61 |
|
61 | |||
62 | echo |
|
62 | echo | |
63 | echo '# removing the cache' |
|
63 | echo '# removing the cache' | |
64 |
rm |
|
64 | rm .hg/branches.cache | |
65 | show_branch_cache 1 |
|
65 | show_branch_cache 1 | |
66 |
|
66 | |||
67 | echo |
|
67 | echo |
@@ -60,7 +60,7 b' tm()' | |||||
60 | echo |
|
60 | echo | |
61 |
|
61 | |||
62 | cd .. |
|
62 | cd .. | |
63 |
rm -r |
|
63 | rm -r t | |
64 | } |
|
64 | } | |
65 |
|
65 | |||
66 | up() { |
|
66 | up() { |
@@ -49,7 +49,7 b' echo %% should add a, forget z' | |||||
49 | hg revert --all -r0 |
|
49 | hg revert --all -r0 | |
50 | echo %% should forget a |
|
50 | echo %% should forget a | |
51 | hg revert --all -rtip |
|
51 | hg revert --all -rtip | |
52 |
rm |
|
52 | rm a *.orig | |
53 | echo %% should silently add a |
|
53 | echo %% should silently add a | |
54 | hg revert -r0 a |
|
54 | hg revert -r0 a | |
55 | hg st a |
|
55 | hg st a |
@@ -23,7 +23,7 b' hg addremove' | |||||
23 | #Assert screamed here before, should go by without consequence |
|
23 | #Assert screamed here before, should go by without consequence | |
24 | hg commit -m 'is there a bug?' |
|
24 | hg commit -m 'is there a bug?' | |
25 |
|
25 | |||
26 |
cd .. ; rm -r |
|
26 | cd .. ; rm -r test | |
27 | hg init test; cd test; |
|
27 | hg init test; cd test; | |
28 |
|
28 | |||
29 | mkdir dir |
|
29 | mkdir dir |
General Comments 0
You need to be logged in to leave comments.
Login now