Show More
@@ -1,61 +1,80 | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init test |
|
3 | hg init test | |
4 | cd test |
|
4 | cd test | |
5 | echo 0 > afile |
|
5 | echo 0 > afile | |
6 | hg add afile |
|
6 | hg add afile | |
7 | hg commit -m "0.0" -d "1000000 0" |
|
7 | hg commit -m "0.0" -d "1000000 0" | |
8 | echo 1 >> afile |
|
8 | echo 1 >> afile | |
9 | hg commit -m "0.1" -d "1000000 0" |
|
9 | hg commit -m "0.1" -d "1000000 0" | |
10 | echo 2 >> afile |
|
10 | echo 2 >> afile | |
11 | hg commit -m "0.2" -d "1000000 0" |
|
11 | hg commit -m "0.2" -d "1000000 0" | |
12 | echo 3 >> afile |
|
12 | echo 3 >> afile | |
13 | hg commit -m "0.3" -d "1000000 0" |
|
13 | hg commit -m "0.3" -d "1000000 0" | |
14 | hg update -C 0 |
|
14 | hg update -C 0 | |
15 | echo 1 >> afile |
|
15 | echo 1 >> afile | |
16 | hg commit -m "1.1" -d "1000000 0" |
|
16 | hg commit -m "1.1" -d "1000000 0" | |
17 | echo 2 >> afile |
|
17 | echo 2 >> afile | |
18 | hg commit -m "1.2" -d "1000000 0" |
|
18 | hg commit -m "1.2" -d "1000000 0" | |
19 | echo "a line" > fred |
|
19 | echo "a line" > fred | |
20 | echo 3 >> afile |
|
20 | echo 3 >> afile | |
21 | hg add fred |
|
21 | hg add fred | |
22 | hg commit -m "1.3" -d "1000000 0" |
|
22 | hg commit -m "1.3" -d "1000000 0" | |
23 | hg mv afile adifferentfile |
|
23 | hg mv afile adifferentfile | |
24 | hg commit -m "1.3m" -d "1000000 0" |
|
24 | hg commit -m "1.3m" -d "1000000 0" | |
25 | hg update -C 3 |
|
25 | hg update -C 3 | |
26 | hg mv afile anotherfile |
|
26 | hg mv afile anotherfile | |
27 | hg commit -m "0.3m" -d "1000000 0" |
|
27 | hg commit -m "0.3m" -d "1000000 0" | |
28 | hg verify |
|
28 | hg verify | |
29 | cd .. |
|
29 | cd .. | |
30 | hg init empty |
|
30 | hg init empty | |
31 | hg -R test bundle full.hg empty |
|
31 | hg -R test bundle full.hg empty | |
32 | hg -R test unbundle full.hg |
|
32 | hg -R test unbundle full.hg | |
33 | hg -R empty heads |
|
33 | hg -R empty heads | |
34 | hg -R empty verify |
|
34 | hg -R empty verify | |
35 |
|
35 | |||
36 | hg --cwd test pull ../full.hg |
|
36 | hg --cwd test pull ../full.hg | |
37 | hg --cwd empty pull ../full.hg |
|
37 | 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 empty |
|
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 | |
45 | echo '[hooks]' >> .hg/hgrc |
|
45 | echo '[hooks]' >> .hg/hgrc | |
46 | echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc |
|
46 | echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc | |
47 | #doesn't work (yet ?) |
|
47 | #doesn't work (yet ?) | |
48 | #hg -R bundle://../full.hg verify |
|
48 | #hg -R bundle://../full.hg verify | |
49 | hg pull bundle://../full.hg |
|
49 | hg pull bundle://../full.hg | |
50 | cd .. |
|
50 | cd .. | |
51 |
|
51 | |||
52 | rm -r empty |
|
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 | |
56 | cd partial |
|
56 | cd partial | |
57 | hg -R bundle://../full.hg log |
|
57 | hg -R bundle://../full.hg log | |
58 | hg incoming bundle://../full.hg |
|
58 | hg incoming bundle://../full.hg | |
59 | hg -R bundle://../full.hg outgoing ../partial2 |
|
59 | hg -R bundle://../full.hg outgoing ../partial2 | |
60 | hg -R bundle://../does-not-exist.hg outgoing ../partial2 |
|
60 | hg -R bundle://../does-not-exist.hg outgoing ../partial2 | |
61 | cd .. |
|
61 | cd .. | |
|
62 | ||||
|
63 | # test for 540d1059c802 | |||
|
64 | hg init orig | |||
|
65 | cd orig | |||
|
66 | echo foo > foo | |||
|
67 | hg add foo | |||
|
68 | hg ci -m 'add foo' -d '0 0' | |||
|
69 | ||||
|
70 | hg clone . ../copy | |||
|
71 | hg tag -d '0 0' foo | |||
|
72 | ||||
|
73 | cd ../copy | |||
|
74 | echo >> foo | |||
|
75 | hg ci -m 'change foo' -d '0 0' | |||
|
76 | hg bundle ../bundle.hg ../orig | |||
|
77 | ||||
|
78 | cd ../orig | |||
|
79 | hg incoming ../bundle.hg | |||
|
80 | cd .. |
@@ -1,211 +1,221 | |||||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
3 | checking changesets |
|
3 | checking changesets | |
4 | checking manifests |
|
4 | checking manifests | |
5 | crosschecking files in changesets and manifests |
|
5 | crosschecking files in changesets and manifests | |
6 | checking files |
|
6 | checking files | |
7 | 4 files, 9 changesets, 7 total revisions |
|
7 | 4 files, 9 changesets, 7 total revisions | |
8 | searching for changes |
|
8 | searching for changes | |
9 | adding changesets |
|
9 | adding changesets | |
10 | adding manifests |
|
10 | adding manifests | |
11 | adding file changes |
|
11 | adding file changes | |
12 | added 0 changesets with 0 changes to 4 files |
|
12 | added 0 changesets with 0 changes to 4 files | |
13 | (run 'hg update' to get a working copy) |
|
13 | (run 'hg update' to get a working copy) | |
14 | changeset: -1:000000000000 |
|
14 | changeset: -1:000000000000 | |
15 | tag: tip |
|
15 | tag: tip | |
16 | user: |
|
16 | user: | |
17 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
17 | date: Thu Jan 01 00:00:00 1970 +0000 | |
18 |
|
18 | |||
19 | checking changesets |
|
19 | checking changesets | |
20 | checking manifests |
|
20 | checking manifests | |
21 | crosschecking files in changesets and manifests |
|
21 | crosschecking files in changesets and manifests | |
22 | checking files |
|
22 | checking files | |
23 | 0 files, 0 changesets, 0 total revisions |
|
23 | 0 files, 0 changesets, 0 total revisions | |
24 | pulling from ../full.hg |
|
24 | pulling from ../full.hg | |
25 | searching for changes |
|
25 | searching for changes | |
26 | no changes found |
|
26 | no changes found | |
27 | pulling from ../full.hg |
|
27 | pulling from ../full.hg | |
28 | requesting all changes |
|
28 | requesting all changes | |
29 | adding changesets |
|
29 | adding changesets | |
30 | adding manifests |
|
30 | adding manifests | |
31 | adding file changes |
|
31 | adding file changes | |
32 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
32 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
33 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
33 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
34 | rolling back last transaction |
|
34 | rolling back last transaction | |
35 | pulling from ../full.hg |
|
35 | pulling from ../full.hg | |
36 | requesting all changes |
|
36 | requesting all changes | |
37 | adding changesets |
|
37 | adding changesets | |
38 | adding manifests |
|
38 | adding manifests | |
39 | adding file changes |
|
39 | adding file changes | |
40 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
40 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
41 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
41 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
42 | changeset: 8:836ac62537ab |
|
42 | changeset: 8:836ac62537ab | |
43 | tag: tip |
|
43 | tag: tip | |
44 | parent: 3:ac69c658229d |
|
44 | parent: 3:ac69c658229d | |
45 | user: test |
|
45 | user: test | |
46 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
46 | date: Mon Jan 12 13:46:40 1970 +0000 | |
47 | summary: 0.3m |
|
47 | summary: 0.3m | |
48 |
|
48 | |||
49 | changeset: 7:80fe151401c2 |
|
49 | changeset: 7:80fe151401c2 | |
50 | user: test |
|
50 | user: test | |
51 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
51 | date: Mon Jan 12 13:46:40 1970 +0000 | |
52 | summary: 1.3m |
|
52 | summary: 1.3m | |
53 |
|
53 | |||
54 | changeset: 6:1e3f6b843bd6 |
|
54 | changeset: 6:1e3f6b843bd6 | |
55 | user: test |
|
55 | user: test | |
56 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
56 | date: Mon Jan 12 13:46:40 1970 +0000 | |
57 | summary: 1.3 |
|
57 | summary: 1.3 | |
58 |
|
58 | |||
59 | changeset: 5:024e4e7df376 |
|
59 | changeset: 5:024e4e7df376 | |
60 | user: test |
|
60 | user: test | |
61 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
61 | date: Mon Jan 12 13:46:40 1970 +0000 | |
62 | summary: 1.2 |
|
62 | summary: 1.2 | |
63 |
|
63 | |||
64 | changeset: 4:5f4f3ceb285e |
|
64 | changeset: 4:5f4f3ceb285e | |
65 | parent: 0:5649c9d34dd8 |
|
65 | parent: 0:5649c9d34dd8 | |
66 | user: test |
|
66 | user: test | |
67 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
67 | date: Mon Jan 12 13:46:40 1970 +0000 | |
68 | summary: 1.1 |
|
68 | summary: 1.1 | |
69 |
|
69 | |||
70 | changeset: 3:ac69c658229d |
|
70 | changeset: 3:ac69c658229d | |
71 | user: test |
|
71 | user: test | |
72 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
72 | date: Mon Jan 12 13:46:40 1970 +0000 | |
73 | summary: 0.3 |
|
73 | summary: 0.3 | |
74 |
|
74 | |||
75 | changeset: 2:d62976ca1e50 |
|
75 | changeset: 2:d62976ca1e50 | |
76 | user: test |
|
76 | user: test | |
77 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
77 | date: Mon Jan 12 13:46:40 1970 +0000 | |
78 | summary: 0.2 |
|
78 | summary: 0.2 | |
79 |
|
79 | |||
80 | changeset: 1:10b2180f755b |
|
80 | changeset: 1:10b2180f755b | |
81 | user: test |
|
81 | user: test | |
82 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
82 | date: Mon Jan 12 13:46:40 1970 +0000 | |
83 | summary: 0.1 |
|
83 | summary: 0.1 | |
84 |
|
84 | |||
85 | changeset: 0:5649c9d34dd8 |
|
85 | changeset: 0:5649c9d34dd8 | |
86 | user: test |
|
86 | user: test | |
87 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
87 | date: Mon Jan 12 13:46:40 1970 +0000 | |
88 | summary: 0.0 |
|
88 | summary: 0.0 | |
89 |
|
89 | |||
90 | changegroup: u=bundle:../full.hg |
|
90 | changegroup: u=bundle:../full.hg | |
91 | pulling from bundle://../full.hg |
|
91 | pulling from bundle://../full.hg | |
92 | requesting all changes |
|
92 | requesting all changes | |
93 | adding changesets |
|
93 | adding changesets | |
94 | adding manifests |
|
94 | adding manifests | |
95 | adding file changes |
|
95 | adding file changes | |
96 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
96 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
97 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
97 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
98 | requesting all changes |
|
98 | requesting all changes | |
99 | adding changesets |
|
99 | adding changesets | |
100 | adding manifests |
|
100 | adding manifests | |
101 | adding file changes |
|
101 | adding file changes | |
102 | added 4 changesets with 4 changes to 1 files |
|
102 | added 4 changesets with 4 changes to 1 files | |
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
104 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
104 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
105 | changeset: 8:836ac62537ab |
|
105 | changeset: 8:836ac62537ab | |
106 | tag: tip |
|
106 | tag: tip | |
107 | parent: 3:ac69c658229d |
|
107 | parent: 3:ac69c658229d | |
108 | user: test |
|
108 | user: test | |
109 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
109 | date: Mon Jan 12 13:46:40 1970 +0000 | |
110 | summary: 0.3m |
|
110 | summary: 0.3m | |
111 |
|
111 | |||
112 | changeset: 7:80fe151401c2 |
|
112 | changeset: 7:80fe151401c2 | |
113 | user: test |
|
113 | user: test | |
114 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
114 | date: Mon Jan 12 13:46:40 1970 +0000 | |
115 | summary: 1.3m |
|
115 | summary: 1.3m | |
116 |
|
116 | |||
117 | changeset: 6:1e3f6b843bd6 |
|
117 | changeset: 6:1e3f6b843bd6 | |
118 | user: test |
|
118 | user: test | |
119 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
119 | date: Mon Jan 12 13:46:40 1970 +0000 | |
120 | summary: 1.3 |
|
120 | summary: 1.3 | |
121 |
|
121 | |||
122 | changeset: 5:024e4e7df376 |
|
122 | changeset: 5:024e4e7df376 | |
123 | user: test |
|
123 | user: test | |
124 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
124 | date: Mon Jan 12 13:46:40 1970 +0000 | |
125 | summary: 1.2 |
|
125 | summary: 1.2 | |
126 |
|
126 | |||
127 | changeset: 4:5f4f3ceb285e |
|
127 | changeset: 4:5f4f3ceb285e | |
128 | parent: 0:5649c9d34dd8 |
|
128 | parent: 0:5649c9d34dd8 | |
129 | user: test |
|
129 | user: test | |
130 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
130 | date: Mon Jan 12 13:46:40 1970 +0000 | |
131 | summary: 1.1 |
|
131 | summary: 1.1 | |
132 |
|
132 | |||
133 | changeset: 3:ac69c658229d |
|
133 | changeset: 3:ac69c658229d | |
134 | user: test |
|
134 | user: test | |
135 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
135 | date: Mon Jan 12 13:46:40 1970 +0000 | |
136 | summary: 0.3 |
|
136 | summary: 0.3 | |
137 |
|
137 | |||
138 | changeset: 2:d62976ca1e50 |
|
138 | changeset: 2:d62976ca1e50 | |
139 | user: test |
|
139 | user: test | |
140 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
140 | date: Mon Jan 12 13:46:40 1970 +0000 | |
141 | summary: 0.2 |
|
141 | summary: 0.2 | |
142 |
|
142 | |||
143 | changeset: 1:10b2180f755b |
|
143 | changeset: 1:10b2180f755b | |
144 | user: test |
|
144 | user: test | |
145 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
145 | date: Mon Jan 12 13:46:40 1970 +0000 | |
146 | summary: 0.1 |
|
146 | summary: 0.1 | |
147 |
|
147 | |||
148 | changeset: 0:5649c9d34dd8 |
|
148 | changeset: 0:5649c9d34dd8 | |
149 | user: test |
|
149 | user: test | |
150 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
150 | date: Mon Jan 12 13:46:40 1970 +0000 | |
151 | summary: 0.0 |
|
151 | summary: 0.0 | |
152 |
|
152 | |||
153 | searching for changes |
|
153 | searching for changes | |
154 | changeset: 4:5f4f3ceb285e |
|
154 | changeset: 4:5f4f3ceb285e | |
155 | parent: 0:5649c9d34dd8 |
|
155 | parent: 0:5649c9d34dd8 | |
156 | user: test |
|
156 | user: test | |
157 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
157 | date: Mon Jan 12 13:46:40 1970 +0000 | |
158 | summary: 1.1 |
|
158 | summary: 1.1 | |
159 |
|
159 | |||
160 | changeset: 5:024e4e7df376 |
|
160 | changeset: 5:024e4e7df376 | |
161 | user: test |
|
161 | user: test | |
162 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
162 | date: Mon Jan 12 13:46:40 1970 +0000 | |
163 | summary: 1.2 |
|
163 | summary: 1.2 | |
164 |
|
164 | |||
165 | changeset: 6:1e3f6b843bd6 |
|
165 | changeset: 6:1e3f6b843bd6 | |
166 | user: test |
|
166 | user: test | |
167 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
167 | date: Mon Jan 12 13:46:40 1970 +0000 | |
168 | summary: 1.3 |
|
168 | summary: 1.3 | |
169 |
|
169 | |||
170 | changeset: 7:80fe151401c2 |
|
170 | changeset: 7:80fe151401c2 | |
171 | user: test |
|
171 | user: test | |
172 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
172 | date: Mon Jan 12 13:46:40 1970 +0000 | |
173 | summary: 1.3m |
|
173 | summary: 1.3m | |
174 |
|
174 | |||
175 | changeset: 8:836ac62537ab |
|
175 | changeset: 8:836ac62537ab | |
176 | tag: tip |
|
176 | tag: tip | |
177 | parent: 3:ac69c658229d |
|
177 | parent: 3:ac69c658229d | |
178 | user: test |
|
178 | user: test | |
179 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
179 | date: Mon Jan 12 13:46:40 1970 +0000 | |
180 | summary: 0.3m |
|
180 | summary: 0.3m | |
181 |
|
181 | |||
182 | searching for changes |
|
182 | searching for changes | |
183 | changeset: 4:5f4f3ceb285e |
|
183 | changeset: 4:5f4f3ceb285e | |
184 | parent: 0:5649c9d34dd8 |
|
184 | parent: 0:5649c9d34dd8 | |
185 | user: test |
|
185 | user: test | |
186 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
186 | date: Mon Jan 12 13:46:40 1970 +0000 | |
187 | summary: 1.1 |
|
187 | summary: 1.1 | |
188 |
|
188 | |||
189 | changeset: 5:024e4e7df376 |
|
189 | changeset: 5:024e4e7df376 | |
190 | user: test |
|
190 | user: test | |
191 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
191 | date: Mon Jan 12 13:46:40 1970 +0000 | |
192 | summary: 1.2 |
|
192 | summary: 1.2 | |
193 |
|
193 | |||
194 | changeset: 6:1e3f6b843bd6 |
|
194 | changeset: 6:1e3f6b843bd6 | |
195 | user: test |
|
195 | user: test | |
196 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
196 | date: Mon Jan 12 13:46:40 1970 +0000 | |
197 | summary: 1.3 |
|
197 | summary: 1.3 | |
198 |
|
198 | |||
199 | changeset: 7:80fe151401c2 |
|
199 | changeset: 7:80fe151401c2 | |
200 | user: test |
|
200 | user: test | |
201 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
201 | date: Mon Jan 12 13:46:40 1970 +0000 | |
202 | summary: 1.3m |
|
202 | summary: 1.3m | |
203 |
|
203 | |||
204 | changeset: 8:836ac62537ab |
|
204 | changeset: 8:836ac62537ab | |
205 | tag: tip |
|
205 | tag: tip | |
206 | parent: 3:ac69c658229d |
|
206 | parent: 3:ac69c658229d | |
207 | user: test |
|
207 | user: test | |
208 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
208 | date: Mon Jan 12 13:46:40 1970 +0000 | |
209 | summary: 0.3m |
|
209 | summary: 0.3m | |
210 |
|
210 | |||
211 | abort: No such file or directory: ../does-not-exist.hg |
|
211 | abort: No such file or directory: ../does-not-exist.hg | |
|
212 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
213 | searching for changes | |||
|
214 | searching for changes | |||
|
215 | changeset: 2:ed1b79f46b9a | |||
|
216 | tag: tip | |||
|
217 | parent: 0:bbd179dfa0a7 | |||
|
218 | user: test | |||
|
219 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
220 | summary: change foo | |||
|
221 |
General Comments 0
You need to be logged in to leave comments.
Login now