Show More
@@ -1,277 +1,286 b'' | |||||
1 | $ hg init test |
|
1 | $ hg init test | |
2 | $ cd test |
|
2 | $ cd test | |
3 | $ hg unbundle "$TESTDIR/bundles/remote.hg" |
|
3 | $ hg unbundle "$TESTDIR/bundles/remote.hg" | |
4 | adding changesets |
|
4 | adding changesets | |
5 | adding manifests |
|
5 | adding manifests | |
6 | adding file changes |
|
6 | adding file changes | |
7 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
7 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
8 | new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts) |
|
8 | new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts) | |
9 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
9 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
10 | $ hg up tip |
|
10 | $ hg up tip | |
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 | $ cd .. |
|
12 | $ cd .. | |
13 |
|
13 | |||
14 | $ for i in 0 1 2 3 4 5 6 7 8; do |
|
14 | $ for i in 0 1 2 3 4 5 6 7 8; do | |
15 | > mkdir test-"$i" |
|
15 | > mkdir test-"$i" | |
16 | > hg --cwd test-"$i" init |
|
16 | > hg --cwd test-"$i" init | |
17 | > hg -R test bundle -r "$i" test-"$i".hg test-"$i" |
|
17 | > hg -R test bundle -r "$i" test-"$i".hg test-"$i" | |
18 | > cd test-"$i" |
|
18 | > cd test-"$i" | |
19 | > hg unbundle ../test-"$i".hg |
|
19 | > hg unbundle ../test-"$i".hg | |
20 | > hg verify -q |
|
20 | > hg verify -q | |
21 | > hg tip -q |
|
21 | > hg tip -q | |
22 | > cd .. |
|
22 | > cd .. | |
23 | > done |
|
23 | > done | |
24 | searching for changes |
|
24 | searching for changes | |
25 | 1 changesets found |
|
25 | 1 changesets found | |
26 | adding changesets |
|
26 | adding changesets | |
27 | adding manifests |
|
27 | adding manifests | |
28 | adding file changes |
|
28 | adding file changes | |
29 | added 1 changesets with 1 changes to 1 files |
|
29 | added 1 changesets with 1 changes to 1 files | |
30 | new changesets bfaf4b5cbf01 (1 drafts) |
|
30 | new changesets bfaf4b5cbf01 (1 drafts) | |
31 | (run 'hg update' to get a working copy) |
|
31 | (run 'hg update' to get a working copy) | |
32 | 0:bfaf4b5cbf01 |
|
32 | 0:bfaf4b5cbf01 | |
33 | searching for changes |
|
33 | searching for changes | |
34 | 2 changesets found |
|
34 | 2 changesets found | |
35 | adding changesets |
|
35 | adding changesets | |
36 | adding manifests |
|
36 | adding manifests | |
37 | adding file changes |
|
37 | adding file changes | |
38 | added 2 changesets with 2 changes to 1 files |
|
38 | added 2 changesets with 2 changes to 1 files | |
39 | new changesets bfaf4b5cbf01:21f32785131f (2 drafts) |
|
39 | new changesets bfaf4b5cbf01:21f32785131f (2 drafts) | |
40 | (run 'hg update' to get a working copy) |
|
40 | (run 'hg update' to get a working copy) | |
41 | 1:21f32785131f |
|
41 | 1:21f32785131f | |
42 | searching for changes |
|
42 | searching for changes | |
43 | 3 changesets found |
|
43 | 3 changesets found | |
44 | adding changesets |
|
44 | adding changesets | |
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 3 changesets with 3 changes to 1 files |
|
47 | added 3 changesets with 3 changes to 1 files | |
48 | new changesets bfaf4b5cbf01:4ce51a113780 (3 drafts) |
|
48 | new changesets bfaf4b5cbf01:4ce51a113780 (3 drafts) | |
49 | (run 'hg update' to get a working copy) |
|
49 | (run 'hg update' to get a working copy) | |
50 | 2:4ce51a113780 |
|
50 | 2:4ce51a113780 | |
51 | searching for changes |
|
51 | searching for changes | |
52 | 4 changesets found |
|
52 | 4 changesets found | |
53 | adding changesets |
|
53 | adding changesets | |
54 | adding manifests |
|
54 | adding manifests | |
55 | adding file changes |
|
55 | adding file changes | |
56 | added 4 changesets with 4 changes to 1 files |
|
56 | added 4 changesets with 4 changes to 1 files | |
57 | new changesets bfaf4b5cbf01:93ee6ab32777 (4 drafts) |
|
57 | new changesets bfaf4b5cbf01:93ee6ab32777 (4 drafts) | |
58 | (run 'hg update' to get a working copy) |
|
58 | (run 'hg update' to get a working copy) | |
59 | 3:93ee6ab32777 |
|
59 | 3:93ee6ab32777 | |
60 | searching for changes |
|
60 | searching for changes | |
61 | 2 changesets found |
|
61 | 2 changesets found | |
62 | adding changesets |
|
62 | adding changesets | |
63 | adding manifests |
|
63 | adding manifests | |
64 | adding file changes |
|
64 | adding file changes | |
65 | added 2 changesets with 2 changes to 1 files |
|
65 | added 2 changesets with 2 changes to 1 files | |
66 | new changesets bfaf4b5cbf01:c70afb1ee985 (2 drafts) |
|
66 | new changesets bfaf4b5cbf01:c70afb1ee985 (2 drafts) | |
67 | (run 'hg update' to get a working copy) |
|
67 | (run 'hg update' to get a working copy) | |
68 | 1:c70afb1ee985 |
|
68 | 1:c70afb1ee985 | |
69 | searching for changes |
|
69 | searching for changes | |
70 | 3 changesets found |
|
70 | 3 changesets found | |
71 | adding changesets |
|
71 | adding changesets | |
72 | adding manifests |
|
72 | adding manifests | |
73 | adding file changes |
|
73 | adding file changes | |
74 | added 3 changesets with 3 changes to 1 files |
|
74 | added 3 changesets with 3 changes to 1 files | |
75 | new changesets bfaf4b5cbf01:f03ae5a9b979 (3 drafts) |
|
75 | new changesets bfaf4b5cbf01:f03ae5a9b979 (3 drafts) | |
76 | (run 'hg update' to get a working copy) |
|
76 | (run 'hg update' to get a working copy) | |
77 | 2:f03ae5a9b979 |
|
77 | 2:f03ae5a9b979 | |
78 | searching for changes |
|
78 | searching for changes | |
79 | 4 changesets found |
|
79 | 4 changesets found | |
80 | adding changesets |
|
80 | adding changesets | |
81 | adding manifests |
|
81 | adding manifests | |
82 | adding file changes |
|
82 | adding file changes | |
83 | added 4 changesets with 5 changes to 2 files |
|
83 | added 4 changesets with 5 changes to 2 files | |
84 | new changesets bfaf4b5cbf01:095cb14b1b4d (4 drafts) |
|
84 | new changesets bfaf4b5cbf01:095cb14b1b4d (4 drafts) | |
85 | (run 'hg update' to get a working copy) |
|
85 | (run 'hg update' to get a working copy) | |
86 | 3:095cb14b1b4d |
|
86 | 3:095cb14b1b4d | |
87 | searching for changes |
|
87 | searching for changes | |
88 | 5 changesets found |
|
88 | 5 changesets found | |
89 | adding changesets |
|
89 | adding changesets | |
90 | adding manifests |
|
90 | adding manifests | |
91 | adding file changes |
|
91 | adding file changes | |
92 | added 5 changesets with 6 changes to 3 files |
|
92 | added 5 changesets with 6 changes to 3 files | |
93 | new changesets bfaf4b5cbf01:faa2e4234c7a (5 drafts) |
|
93 | new changesets bfaf4b5cbf01:faa2e4234c7a (5 drafts) | |
94 | (run 'hg update' to get a working copy) |
|
94 | (run 'hg update' to get a working copy) | |
95 | 4:faa2e4234c7a |
|
95 | 4:faa2e4234c7a | |
96 | searching for changes |
|
96 | searching for changes | |
97 | 5 changesets found |
|
97 | 5 changesets found | |
98 | adding changesets |
|
98 | adding changesets | |
99 | adding manifests |
|
99 | adding manifests | |
100 | adding file changes |
|
100 | adding file changes | |
101 | added 5 changesets with 5 changes to 2 files |
|
101 | added 5 changesets with 5 changes to 2 files | |
102 | new changesets bfaf4b5cbf01:916f1afdef90 (5 drafts) |
|
102 | new changesets bfaf4b5cbf01:916f1afdef90 (5 drafts) | |
103 | (run 'hg update' to get a working copy) |
|
103 | (run 'hg update' to get a working copy) | |
104 | 4:916f1afdef90 |
|
104 | 4:916f1afdef90 | |
105 | $ cd test-8 |
|
105 | $ cd test-8 | |
106 | $ hg pull ../test-7 |
|
106 | $ hg pull ../test-7 | |
107 | pulling from ../test-7 |
|
107 | pulling from ../test-7 | |
108 | searching for changes |
|
108 | searching for changes | |
109 | adding changesets |
|
109 | adding changesets | |
110 | adding manifests |
|
110 | adding manifests | |
111 | adding file changes |
|
111 | adding file changes | |
112 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
112 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
113 | new changesets c70afb1ee985:faa2e4234c7a |
|
113 | new changesets c70afb1ee985:faa2e4234c7a | |
114 | 1 local changesets published |
|
114 | 1 local changesets published | |
115 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
115 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
116 | $ hg verify -q |
|
116 | $ hg verify -q | |
117 | $ hg rollback |
|
117 | $ hg rollback | |
118 | repository tip rolled back to revision 4 (undo pull) |
|
118 | repository tip rolled back to revision 4 (undo pull) | |
119 | $ cd .. |
|
119 | $ cd .. | |
120 |
|
120 | |||
121 | should fail |
|
121 | should fail | |
122 |
|
122 | |||
123 | $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3 |
|
123 | $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3 | |
124 | abort: --base is incompatible with specifying destinations |
|
124 | abort: --base is incompatible with specifying destinations | |
125 | [10] |
|
125 | [10] | |
126 | $ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3 |
|
126 | $ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3 | |
127 | abort: --all is incompatible with specifying destinations |
|
127 | abort: --all is incompatible with specifying destinations | |
128 | [10] |
|
128 | [10] | |
129 | $ hg -R test bundle -r tip test-bundle-branch1.hg |
|
129 | $ hg -R test bundle -r tip test-bundle-branch1.hg | |
130 | config error: default repository not configured! |
|
130 | config error: default repository not configured! | |
131 | (see 'hg help config.paths') |
|
131 | (see 'hg help config.paths') | |
132 | [30] |
|
132 | [30] | |
133 |
|
133 | |||
134 | $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg |
|
134 | $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg | |
135 | 2 changesets found |
|
135 | 2 changesets found | |
136 | $ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg |
|
136 | $ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg | |
137 | 4 changesets found |
|
137 | 4 changesets found | |
138 | $ hg -R test bundle --base 2 test-bundle-all.hg |
|
138 | $ hg -R test bundle --base 2 test-bundle-all.hg | |
139 | 6 changesets found |
|
139 | 6 changesets found | |
140 | $ hg -R test bundle --base 2 --all test-bundle-all-2.hg |
|
140 | $ hg -R test bundle --base 2 --all test-bundle-all-2.hg | |
141 | ignoring --base because --all was specified |
|
141 | ignoring --base because --all was specified | |
142 | 9 changesets found |
|
142 | 9 changesets found | |
|
143 | $ hg -R test bundle --base 3-3 -r tip test-base-match-nothing-with-dest.hg --config paths.default=$TESTTMP/test-3 | |||
|
144 | searching for changes (known-bad-output !) | |||
|
145 | 1 changesets found (known-bad-output !) | |||
|
146 | 5 changesets found (missing-correct-output !) | |||
|
147 | $ hg -R test bundle --base 3-3 -r tip test-base-match-nothing-no-dest.hg | |||
|
148 | config error: default repository not configured! (known-bad-output !) | |||
|
149 | (see 'hg help config.paths') (known-bad-output !) | |||
|
150 | 5 changesets found (missing-correct-output !) | |||
|
151 | [30] | |||
143 | $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg |
|
152 | $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg | |
144 | 1 changesets found |
|
153 | 1 changesets found | |
145 |
|
154 | |||
146 | empty bundle |
|
155 | empty bundle | |
147 |
|
156 | |||
148 | $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg |
|
157 | $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg | |
149 | no changes found |
|
158 | no changes found | |
150 | [1] |
|
159 | [1] | |
151 |
|
160 | |||
152 | issue76 msg2163 |
|
161 | issue76 msg2163 | |
153 |
|
162 | |||
154 | $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg |
|
163 | $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg | |
155 | no changes found |
|
164 | no changes found | |
156 | [1] |
|
165 | [1] | |
157 |
|
166 | |||
158 | Issue1910: 'hg bundle --base $head' does not exclude $head from |
|
167 | Issue1910: 'hg bundle --base $head' does not exclude $head from | |
159 | result |
|
168 | result | |
160 |
|
169 | |||
161 | $ hg -R test bundle --base 7 test-bundle-cset-7.hg |
|
170 | $ hg -R test bundle --base 7 test-bundle-cset-7.hg | |
162 | 4 changesets found |
|
171 | 4 changesets found | |
163 |
|
172 | |||
164 | $ hg clone test-2 test-9 |
|
173 | $ hg clone test-2 test-9 | |
165 | updating to branch default |
|
174 | updating to branch default | |
166 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
167 | $ cd test-9 |
|
176 | $ cd test-9 | |
168 |
|
177 | |||
169 | revision 2 |
|
178 | revision 2 | |
170 |
|
179 | |||
171 | $ hg tip -q |
|
180 | $ hg tip -q | |
172 | 2:4ce51a113780 |
|
181 | 2:4ce51a113780 | |
173 | $ hg unbundle ../test-bundle-should-fail.hg |
|
182 | $ hg unbundle ../test-bundle-should-fail.hg | |
174 | adding changesets |
|
183 | adding changesets | |
175 | transaction abort! |
|
184 | transaction abort! | |
176 | rollback completed |
|
185 | rollback completed | |
177 | abort: 00changelog@93ee6ab32777cd430e07da694794fb6a4f917712: unknown parent |
|
186 | abort: 00changelog@93ee6ab32777cd430e07da694794fb6a4f917712: unknown parent | |
178 | [50] |
|
187 | [50] | |
179 |
|
188 | |||
180 | revision 2 |
|
189 | revision 2 | |
181 |
|
190 | |||
182 | $ hg tip -q |
|
191 | $ hg tip -q | |
183 | 2:4ce51a113780 |
|
192 | 2:4ce51a113780 | |
184 | $ hg unbundle ../test-bundle-all.hg |
|
193 | $ hg unbundle ../test-bundle-all.hg | |
185 | adding changesets |
|
194 | adding changesets | |
186 | adding manifests |
|
195 | adding manifests | |
187 | adding file changes |
|
196 | adding file changes | |
188 | added 6 changesets with 4 changes to 4 files (+1 heads) |
|
197 | added 6 changesets with 4 changes to 4 files (+1 heads) | |
189 | new changesets 93ee6ab32777:916f1afdef90 (6 drafts) |
|
198 | new changesets 93ee6ab32777:916f1afdef90 (6 drafts) | |
190 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
199 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
191 |
|
200 | |||
192 | revision 8 |
|
201 | revision 8 | |
193 |
|
202 | |||
194 | $ hg tip -q |
|
203 | $ hg tip -q | |
195 | 8:916f1afdef90 |
|
204 | 8:916f1afdef90 | |
196 | $ hg verify -q |
|
205 | $ hg verify -q | |
197 | $ hg rollback |
|
206 | $ hg rollback | |
198 | repository tip rolled back to revision 2 (undo unbundle) |
|
207 | repository tip rolled back to revision 2 (undo unbundle) | |
199 |
|
208 | |||
200 | revision 2 |
|
209 | revision 2 | |
201 |
|
210 | |||
202 | $ hg tip -q |
|
211 | $ hg tip -q | |
203 | 2:4ce51a113780 |
|
212 | 2:4ce51a113780 | |
204 | $ hg unbundle ../test-bundle-branch1.hg |
|
213 | $ hg unbundle ../test-bundle-branch1.hg | |
205 | adding changesets |
|
214 | adding changesets | |
206 | adding manifests |
|
215 | adding manifests | |
207 | adding file changes |
|
216 | adding file changes | |
208 | added 2 changesets with 2 changes to 2 files |
|
217 | added 2 changesets with 2 changes to 2 files | |
209 | new changesets 93ee6ab32777:916f1afdef90 (2 drafts) |
|
218 | new changesets 93ee6ab32777:916f1afdef90 (2 drafts) | |
210 | (run 'hg update' to get a working copy) |
|
219 | (run 'hg update' to get a working copy) | |
211 |
|
220 | |||
212 | revision 4 |
|
221 | revision 4 | |
213 |
|
222 | |||
214 | $ hg tip -q |
|
223 | $ hg tip -q | |
215 | 4:916f1afdef90 |
|
224 | 4:916f1afdef90 | |
216 | $ hg verify -q |
|
225 | $ hg verify -q | |
217 | $ hg rollback |
|
226 | $ hg rollback | |
218 | repository tip rolled back to revision 2 (undo unbundle) |
|
227 | repository tip rolled back to revision 2 (undo unbundle) | |
219 | $ hg unbundle ../test-bundle-branch2.hg |
|
228 | $ hg unbundle ../test-bundle-branch2.hg | |
220 | adding changesets |
|
229 | adding changesets | |
221 | adding manifests |
|
230 | adding manifests | |
222 | adding file changes |
|
231 | adding file changes | |
223 | added 4 changesets with 3 changes to 3 files (+1 heads) |
|
232 | added 4 changesets with 3 changes to 3 files (+1 heads) | |
224 | new changesets c70afb1ee985:faa2e4234c7a (4 drafts) |
|
233 | new changesets c70afb1ee985:faa2e4234c7a (4 drafts) | |
225 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
234 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
226 |
|
235 | |||
227 | revision 6 |
|
236 | revision 6 | |
228 |
|
237 | |||
229 | $ hg tip -q |
|
238 | $ hg tip -q | |
230 | 6:faa2e4234c7a |
|
239 | 6:faa2e4234c7a | |
231 | $ hg verify -q |
|
240 | $ hg verify -q | |
232 | $ hg rollback |
|
241 | $ hg rollback | |
233 | repository tip rolled back to revision 2 (undo unbundle) |
|
242 | repository tip rolled back to revision 2 (undo unbundle) | |
234 | $ hg unbundle ../test-bundle-cset-7.hg |
|
243 | $ hg unbundle ../test-bundle-cset-7.hg | |
235 | adding changesets |
|
244 | adding changesets | |
236 | adding manifests |
|
245 | adding manifests | |
237 | adding file changes |
|
246 | adding file changes | |
238 | added 2 changesets with 2 changes to 2 files |
|
247 | added 2 changesets with 2 changes to 2 files | |
239 | new changesets 93ee6ab32777:916f1afdef90 (2 drafts) |
|
248 | new changesets 93ee6ab32777:916f1afdef90 (2 drafts) | |
240 | (run 'hg update' to get a working copy) |
|
249 | (run 'hg update' to get a working copy) | |
241 |
|
250 | |||
242 | revision 4 |
|
251 | revision 4 | |
243 |
|
252 | |||
244 | $ hg tip -q |
|
253 | $ hg tip -q | |
245 | 4:916f1afdef90 |
|
254 | 4:916f1afdef90 | |
246 | $ hg verify -q |
|
255 | $ hg verify -q | |
247 |
|
256 | |||
248 | $ cd ../test |
|
257 | $ cd ../test | |
249 | $ hg merge 7 |
|
258 | $ hg merge 7 | |
250 | note: possible conflict - afile was renamed multiple times to: |
|
259 | note: possible conflict - afile was renamed multiple times to: | |
251 | adifferentfile |
|
260 | adifferentfile | |
252 | anotherfile |
|
261 | anotherfile | |
253 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
262 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
254 | (branch merge, don't forget to commit) |
|
263 | (branch merge, don't forget to commit) | |
255 | $ hg ci -m merge |
|
264 | $ hg ci -m merge | |
256 | $ cd .. |
|
265 | $ cd .. | |
257 | $ hg -R test bundle --base 2 test-bundle-head.hg |
|
266 | $ hg -R test bundle --base 2 test-bundle-head.hg | |
258 | 7 changesets found |
|
267 | 7 changesets found | |
259 | $ hg clone test-2 test-10 |
|
268 | $ hg clone test-2 test-10 | |
260 | updating to branch default |
|
269 | updating to branch default | |
261 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
270 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
262 | $ cd test-10 |
|
271 | $ cd test-10 | |
263 | $ hg unbundle ../test-bundle-head.hg |
|
272 | $ hg unbundle ../test-bundle-head.hg | |
264 | adding changesets |
|
273 | adding changesets | |
265 | adding manifests |
|
274 | adding manifests | |
266 | adding file changes |
|
275 | adding file changes | |
267 | added 7 changesets with 4 changes to 4 files |
|
276 | added 7 changesets with 4 changes to 4 files | |
268 | new changesets 93ee6ab32777:03fc0b0e347c (7 drafts) |
|
277 | new changesets 93ee6ab32777:03fc0b0e347c (7 drafts) | |
269 | (run 'hg update' to get a working copy) |
|
278 | (run 'hg update' to get a working copy) | |
270 |
|
279 | |||
271 | revision 9 |
|
280 | revision 9 | |
272 |
|
281 | |||
273 | $ hg tip -q |
|
282 | $ hg tip -q | |
274 | 9:03fc0b0e347c |
|
283 | 9:03fc0b0e347c | |
275 | $ hg verify -q |
|
284 | $ hg verify -q | |
276 |
|
285 | |||
277 | $ cd .. |
|
286 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now