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