Mercurial > hg

comparison tests/test-bundle-r.t @ 12156:4c94b6d0fb1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
author Martin Geisler <mg@lazybytes.net>
date Thu, 02 Sep 2010 23:22:51 +0200
parents f22b101e33e4
children 4134686b83e1
comparison
equal deleted inserted replaced
12155:94ad12aa0530 12156:4c94b6d0fb1c
1 $ hg init test 1 $ hg init test
2 $ cd test 2 $ cd test
3 $ echo "0" >> afile 3 $ echo "0" >> afile
4 $ hg add afile 4 $ hg add afile
5 $ hg commit -m "0.0" -d "1000000 0" 5 $ hg commit -m "0.0"
6 $ echo "1" >> afile 6 $ echo "1" >> afile
7 $ hg commit -m "0.1" -d "1000000 0" 7 $ hg commit -m "0.1"
8 $ echo "2" >> afile 8 $ echo "2" >> afile
9 $ hg commit -m "0.2" -d "1000000 0" 9 $ hg commit -m "0.2"
10 $ echo "3" >> afile 10 $ echo "3" >> afile
11 $ hg commit -m "0.3" -d "1000000 0" 11 $ hg commit -m "0.3"
12 $ hg update -C 0 12 $ hg update -C 0
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
14 $ echo "1" >> afile 14 $ echo "1" >> afile
15 $ hg commit -m "1.1" -d "1000000 0" 15 $ hg commit -m "1.1"
16 created new head 16 created new head
17 $ echo "2" >> afile 17 $ echo "2" >> afile
18 $ hg commit -m "1.2" -d "1000000 0" 18 $ hg commit -m "1.2"
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"
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"
25 $ hg update -C 3 25 $ hg update -C 3
26 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 26 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
27 $ hg mv afile anotherfile 27 $ hg mv afile anotherfile
28 $ hg commit -m "0.3m" -d "1000000 0" 28 $ hg commit -m "0.3m"
29 $ hg debugindex .hg/store/data/afile.i 29 $ hg debugindex .hg/store/data/afile.i
30 rev offset length base linkrev nodeid p1 p2 30 rev offset length base linkrev nodeid p1 p2
31 0 0 3 0 0 362fef284ce2 000000000000 000000000000 31 0 0 3 0 0 362fef284ce2 000000000000 000000000000
32 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 32 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
33 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 33 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
77 checking changesets 77 checking changesets
78 checking manifests 78 checking manifests
79 crosschecking files in changesets and manifests 79 crosschecking files in changesets and manifests
80 checking files 80 checking files
81 1 files, 1 changesets, 1 total revisions 81 1 files, 1 changesets, 1 total revisions
82 0:5649c9d34dd8 82 0:f9ee2f85a263
83 searching for changes 83 searching for changes
84 2 changesets found 84 2 changesets found
85 adding changesets 85 adding changesets
86 adding manifests 86 adding manifests
87 adding file changes 87 adding file changes
90 checking changesets 90 checking changesets
91 checking manifests 91 checking manifests
92 crosschecking files in changesets and manifests 92 crosschecking files in changesets and manifests
93 checking files 93 checking files
94 1 files, 2 changesets, 2 total revisions 94 1 files, 2 changesets, 2 total revisions
95 1:10b2180f755b 95 1:34c2bf6b0626
96 searching for changes 96 searching for changes
97 3 changesets found 97 3 changesets found
98 adding changesets 98 adding changesets
99 adding manifests 99 adding manifests
100 adding file changes 100 adding file changes
103 checking changesets 103 checking changesets
104 checking manifests 104 checking manifests
105 crosschecking files in changesets and manifests 105 crosschecking files in changesets and manifests
106 checking files 106 checking files
107 1 files, 3 changesets, 3 total revisions 107 1 files, 3 changesets, 3 total revisions
108 2:d62976ca1e50 108 2:e38ba6f5b7e0
109 searching for changes 109 searching for changes
110 4 changesets found 110 4 changesets found
111 adding changesets 111 adding changesets
112 adding manifests 112 adding manifests
113 adding file changes 113 adding file changes
116 checking changesets 116 checking changesets
117 checking manifests 117 checking manifests
118 crosschecking files in changesets and manifests 118 crosschecking files in changesets and manifests
119 checking files 119 checking files
120 1 files, 4 changesets, 4 total revisions 120 1 files, 4 changesets, 4 total revisions
121 3:ac69c658229d 121 3:eebf5a27f8ca
122 searching for changes 122 searching for changes
123 2 changesets found 123 2 changesets found
124 adding changesets 124 adding changesets
125 adding manifests 125 adding manifests
126 adding file changes 126 adding file changes
129 checking changesets 129 checking changesets
130 checking manifests 130 checking manifests
131 crosschecking files in changesets and manifests 131 crosschecking files in changesets and manifests
132 checking files 132 checking files
133 1 files, 2 changesets, 2 total revisions 133 1 files, 2 changesets, 2 total revisions
134 1:5f4f3ceb285e 134 1:095197eb4973
135 searching for changes 135 searching for changes
136 3 changesets found 136 3 changesets found
137 adding changesets 137 adding changesets
138 adding manifests 138 adding manifests
139 adding file changes 139 adding file changes
142 checking changesets 142 checking changesets
143 checking manifests 143 checking manifests
144 crosschecking files in changesets and manifests 144 crosschecking files in changesets and manifests
145 checking files 145 checking files
146 1 files, 3 changesets, 3 total revisions 146 1 files, 3 changesets, 3 total revisions
147 2:024e4e7df376 147 2:1bb50a9436a7
148 searching for changes 148 searching for changes
149 4 changesets found 149 4 changesets found
150 adding changesets 150 adding changesets
151 adding manifests 151 adding manifests
152 adding file changes 152 adding file changes
155 checking changesets 155 checking changesets
156 checking manifests 156 checking manifests
157 crosschecking files in changesets and manifests 157 crosschecking files in changesets and manifests
158 checking files 158 checking files
159 2 files, 4 changesets, 5 total revisions 159 2 files, 4 changesets, 5 total revisions
160 3:1e3f6b843bd6 160 3:7373c1169842
161 searching for changes 161 searching for changes
162 5 changesets found 162 5 changesets found
163 adding changesets 163 adding changesets
164 adding manifests 164 adding manifests
165 adding file changes 165 adding file changes
168 checking changesets 168 checking changesets
169 checking manifests 169 checking manifests
170 crosschecking files in changesets and manifests 170 crosschecking files in changesets and manifests
171 checking files 171 checking files
172 3 files, 5 changesets, 6 total revisions 172 3 files, 5 changesets, 6 total revisions
173 4:27f57c869697 173 4:a6a34bfa0076
174 searching for changes 174 searching for changes
175 5 changesets found 175 5 changesets found
176 adding changesets 176 adding changesets
177 adding manifests 177 adding manifests
178 adding file changes 178 adding file changes
181 checking changesets 181 checking changesets
182 checking manifests 182 checking manifests
183 crosschecking files in changesets and manifests 183 crosschecking files in changesets and manifests
184 checking files 184 checking files
185 2 files, 5 changesets, 5 total revisions 185 2 files, 5 changesets, 5 total revisions
186 4:088ff9d6e1e1 186 4:aa35859c02ea
187 $ cd test-8 187 $ cd test-8
188 $ hg pull ../test-7 188 $ hg pull ../test-7
189 pulling from ../test-7 189 pulling from ../test-7
190 searching for changes 190 searching for changes
191 adding changesets 191 adding changesets
240 $ cd test-9 240 $ cd test-9
241 241
242 revision 2 242 revision 2
243 243
244 $ hg tip -q 244 $ hg tip -q
245 2:d62976ca1e50 245 2:e38ba6f5b7e0
246 $ hg unbundle ../test-bundle-should-fail.hg 246 $ hg unbundle ../test-bundle-should-fail.hg
247 adding changesets 247 adding changesets
248 transaction abort! 248 transaction abort!
249 rollback completed 249 rollback completed
250 abort: 00changelog.i@ac69c658229d: unknown parent! 250 abort: 00changelog.i@eebf5a27f8ca: unknown parent!
251 251
252 revision 2 252 revision 2
253 253
254 $ hg tip -q 254 $ hg tip -q
255 2:d62976ca1e50 255 2:e38ba6f5b7e0
256 $ hg unbundle ../test-bundle-all.hg 256 $ hg unbundle ../test-bundle-all.hg
257 adding changesets 257 adding changesets
258 adding manifests 258 adding manifests
259 adding file changes 259 adding file changes
260 added 6 changesets with 4 changes to 4 files (+1 heads) 260 added 6 changesets with 4 changes to 4 files (+1 heads)
261 (run 'hg heads' to see heads, 'hg merge' to merge) 261 (run 'hg heads' to see heads, 'hg merge' to merge)
262 262
263 revision 8 263 revision 8
264 264
265 $ hg tip -q 265 $ hg tip -q
266 8:088ff9d6e1e1 266 8:aa35859c02ea
267 $ hg verify 267 $ hg verify
268 checking changesets 268 checking changesets
269 checking manifests 269 checking manifests
270 crosschecking files in changesets and manifests 270 crosschecking files in changesets and manifests
271 checking files 271 checking files
274 rolling back to revision 2 (undo unbundle) 274 rolling back to revision 2 (undo unbundle)
275 275
276 revision 2 276 revision 2
277 277
278 $ hg tip -q 278 $ hg tip -q
279 2:d62976ca1e50 279 2:e38ba6f5b7e0
280 $ hg unbundle ../test-bundle-branch1.hg 280 $ hg unbundle ../test-bundle-branch1.hg
281 adding changesets 281 adding changesets
282 adding manifests 282 adding manifests
283 adding file changes 283 adding file changes
284 added 2 changesets with 2 changes to 2 files 284 added 2 changesets with 2 changes to 2 files
285 (run 'hg update' to get a working copy) 285 (run 'hg update' to get a working copy)
286 286
287 revision 4 287 revision 4
288 288
289 $ hg tip -q 289 $ hg tip -q
290 4:088ff9d6e1e1 290 4:aa35859c02ea
291 $ hg verify 291 $ hg verify
292 checking changesets 292 checking changesets
293 checking manifests 293 checking manifests
294 crosschecking files in changesets and manifests 294 crosschecking files in changesets and manifests
295 checking files 295 checking files
304 (run 'hg heads' to see heads, 'hg merge' to merge) 304 (run 'hg heads' to see heads, 'hg merge' to merge)
305 305
306 revision 6 306 revision 6
307 307
308 $ hg tip -q 308 $ hg tip -q
309 6:27f57c869697 309 6:a6a34bfa0076
310 $ hg verify 310 $ hg verify
311 checking changesets 311 checking changesets
312 checking manifests 312 checking manifests
313 crosschecking files in changesets and manifests 313 crosschecking files in changesets and manifests
314 checking files 314 checking files
323 (run 'hg update' to get a working copy) 323 (run 'hg update' to get a working copy)
324 324
325 revision 4 325 revision 4
326 326
327 $ hg tip -q 327 $ hg tip -q
328 4:088ff9d6e1e1 328 4:aa35859c02ea
329 $ hg verify 329 $ hg verify
330 checking changesets 330 checking changesets
331 checking manifests 331 checking manifests
332 crosschecking files in changesets and manifests 332 crosschecking files in changesets and manifests
333 checking files 333 checking files
338 warning: detected divergent renames of afile to: 338 warning: detected divergent renames of afile to:
339 anotherfile 339 anotherfile
340 adifferentfile 340 adifferentfile
341 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 341 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
342 (branch merge, don't forget to commit) 342 (branch merge, don't forget to commit)
343 $ hg ci -m merge -d "1000000 0" 343 $ hg ci -m merge
344 $ cd .. 344 $ cd ..
345 $ hg -R test bundle --base 2 test-bundle-head.hg 345 $ hg -R test bundle --base 2 test-bundle-head.hg
346 7 changesets found 346 7 changesets found
347 $ hg clone test-2 test-10 347 $ hg clone test-2 test-10
348 updating to branch default 348 updating to branch default
356 (run 'hg update' to get a working copy) 356 (run 'hg update' to get a working copy)
357 357
358 revision 9 358 revision 9
359 359
360 $ hg tip -q 360 $ hg tip -q
361 9:e3061ea42e4c 361 9:905597b0d5d4
362 $ hg verify 362 $ hg verify
363 checking changesets 363 checking changesets
364 checking manifests 364 checking manifests
365 crosschecking files in changesets and manifests 365 crosschecking files in changesets and manifests
366 checking files 366 checking files