Show More
@@ -1,404 +1,405 | |||
|
1 | 1 | test-abort-checkin.t |
|
2 | 2 | test-add.t |
|
3 | 3 | test-addremove-similar.t |
|
4 | 4 | test-addremove.t |
|
5 | 5 | test-amend-subrepo.t |
|
6 | 6 | test-amend.t |
|
7 | 7 | test-ancestor.py |
|
8 | 8 | test-annotate.py |
|
9 | 9 | test-annotate.t |
|
10 | 10 | test-archive-symlinks.t |
|
11 | 11 | test-atomictempfile.py |
|
12 | 12 | test-audit-path.t |
|
13 | 13 | test-audit-subrepo.t |
|
14 | 14 | test-automv.t |
|
15 | 15 | test-backout.t |
|
16 | 16 | test-backwards-remove.t |
|
17 | 17 | test-basic.t |
|
18 | 18 | test-bheads.t |
|
19 | test-bisect.t | |
|
19 | 20 | test-bisect2.t |
|
20 | 21 | test-blackbox.t |
|
21 | 22 | test-bookmarks-current.t |
|
22 | 23 | test-bookmarks-merge.t |
|
23 | 24 | test-bookmarks-rebase.t |
|
24 | 25 | test-bookmarks-strip.t |
|
25 | 26 | test-bookmarks.t |
|
26 | 27 | test-branch-option.t |
|
27 | 28 | test-branch-tag-confict.t |
|
28 | 29 | test-branches.t |
|
29 | 30 | test-bundle-phases.t |
|
30 | 31 | test-bundle-type.t |
|
31 | 32 | test-bundle-vs-outgoing.t |
|
32 | 33 | test-bundle2-multiple-changegroups.t |
|
33 | 34 | test-cappedreader.py |
|
34 | 35 | test-casecollision.t |
|
35 | 36 | test-cat.t |
|
36 | 37 | test-censor.t |
|
37 | 38 | test-changelog-exec.t |
|
38 | 39 | test-check-commit.t |
|
39 | 40 | test-check-execute.t |
|
40 | 41 | test-check-module-imports.t |
|
41 | 42 | test-check-pyflakes.t |
|
42 | 43 | test-check-pylint.t |
|
43 | 44 | test-check-shbang.t |
|
44 | 45 | test-children.t |
|
45 | 46 | test-clone-pull-corruption.t |
|
46 | 47 | test-clone-r.t |
|
47 | 48 | test-clone-update-order.t |
|
48 | 49 | test-command-template.t |
|
49 | 50 | test-commit-amend.t |
|
50 | 51 | test-commit-multiple.t |
|
51 | 52 | test-commit-unresolved.t |
|
52 | 53 | test-commit.t |
|
53 | 54 | test-committer.t |
|
54 | 55 | test-completion.t |
|
55 | 56 | test-config-env.py |
|
56 | 57 | test-config.t |
|
57 | 58 | test-conflict.t |
|
58 | 59 | test-confused-revert.t |
|
59 | 60 | test-contrib-check-code.t |
|
60 | 61 | test-contrib-check-commit.t |
|
61 | 62 | test-convert-authormap.t |
|
62 | 63 | test-convert-clonebranches.t |
|
63 | 64 | test-convert-datesort.t |
|
64 | 65 | test-convert-filemap.t |
|
65 | 66 | test-convert-hg-sink.t |
|
66 | 67 | test-convert-hg-source.t |
|
67 | 68 | test-convert-hg-startrev.t |
|
68 | 69 | test-copy-move-merge.t |
|
69 | 70 | test-copy.t |
|
70 | 71 | test-copytrace-heuristics.t |
|
71 | 72 | test-debugbuilddag.t |
|
72 | 73 | test-debugbundle.t |
|
73 | 74 | test-debugextensions.t |
|
74 | 75 | test-debugindexdot.t |
|
75 | 76 | test-debugrename.t |
|
76 | 77 | test-default-push.t |
|
77 | 78 | test-diff-binary-file.t |
|
78 | 79 | test-diff-change.t |
|
79 | 80 | test-diff-copy-depth.t |
|
80 | 81 | test-diff-hashes.t |
|
81 | 82 | test-diff-issue2761.t |
|
82 | 83 | test-diff-newlines.t |
|
83 | 84 | test-diff-reverse.t |
|
84 | 85 | test-diff-subdir.t |
|
85 | 86 | test-diffdir.t |
|
86 | 87 | test-directaccess.t |
|
87 | 88 | test-dirstate-backup.t |
|
88 | 89 | test-dirstate-nonnormalset.t |
|
89 | 90 | test-doctest.py |
|
90 | 91 | test-double-merge.t |
|
91 | 92 | test-drawdag.t |
|
92 | 93 | test-duplicateoptions.py |
|
93 | 94 | test-empty-dir.t |
|
94 | 95 | test-empty-file.t |
|
95 | 96 | test-empty-group.t |
|
96 | 97 | test-empty.t |
|
97 | 98 | test-encode.t |
|
98 | 99 | test-encoding-func.py |
|
99 | 100 | test-encoding.t |
|
100 | 101 | test-eol-add.t |
|
101 | 102 | test-eol-clone.t |
|
102 | 103 | test-eol-hook.t |
|
103 | 104 | test-eol-tag.t |
|
104 | 105 | test-eol-update.t |
|
105 | 106 | test-excessive-merge.t |
|
106 | 107 | test-exchange-obsmarkers-case-A1.t |
|
107 | 108 | test-exchange-obsmarkers-case-A2.t |
|
108 | 109 | test-exchange-obsmarkers-case-A3.t |
|
109 | 110 | test-exchange-obsmarkers-case-A4.t |
|
110 | 111 | test-exchange-obsmarkers-case-A5.t |
|
111 | 112 | test-exchange-obsmarkers-case-A6.t |
|
112 | 113 | test-exchange-obsmarkers-case-A7.t |
|
113 | 114 | test-exchange-obsmarkers-case-B1.t |
|
114 | 115 | test-exchange-obsmarkers-case-B2.t |
|
115 | 116 | test-exchange-obsmarkers-case-B3.t |
|
116 | 117 | test-exchange-obsmarkers-case-B4.t |
|
117 | 118 | test-exchange-obsmarkers-case-B5.t |
|
118 | 119 | test-exchange-obsmarkers-case-B6.t |
|
119 | 120 | test-exchange-obsmarkers-case-B7.t |
|
120 | 121 | test-exchange-obsmarkers-case-C1.t |
|
121 | 122 | test-exchange-obsmarkers-case-C2.t |
|
122 | 123 | test-exchange-obsmarkers-case-C3.t |
|
123 | 124 | test-exchange-obsmarkers-case-C4.t |
|
124 | 125 | test-exchange-obsmarkers-case-D1.t |
|
125 | 126 | test-exchange-obsmarkers-case-D2.t |
|
126 | 127 | test-exchange-obsmarkers-case-D3.t |
|
127 | 128 | test-exchange-obsmarkers-case-D4.t |
|
128 | 129 | test-execute-bit.t |
|
129 | 130 | test-extdiff.t |
|
130 | 131 | test-extra-filelog-entry.t |
|
131 | 132 | test-filebranch.t |
|
132 | 133 | test-fileset-generated.t |
|
133 | 134 | test-flags.t |
|
134 | 135 | test-generaldelta.t |
|
135 | 136 | test-getbundle.t |
|
136 | 137 | test-git-export.t |
|
137 | 138 | test-glog-topological.t |
|
138 | 139 | test-gpg.t |
|
139 | 140 | test-graft.t |
|
140 | 141 | test-hghave.t |
|
141 | 142 | test-hgignore.t |
|
142 | 143 | test-hgk.t |
|
143 | 144 | test-hgweb-bundle.t |
|
144 | 145 | test-hgweb-descend-empties.t |
|
145 | 146 | test-hgweb-removed.t |
|
146 | 147 | test-histedit-arguments.t |
|
147 | 148 | test-histedit-base.t |
|
148 | 149 | test-histedit-bookmark-motion.t |
|
149 | 150 | test-histedit-commute.t |
|
150 | 151 | test-histedit-drop.t |
|
151 | 152 | test-histedit-edit.t |
|
152 | 153 | test-histedit-fold-non-commute.t |
|
153 | 154 | test-histedit-fold.t |
|
154 | 155 | test-histedit-no-change.t |
|
155 | 156 | test-histedit-non-commute-abort.t |
|
156 | 157 | test-histedit-non-commute.t |
|
157 | 158 | test-histedit-obsolete.t |
|
158 | 159 | test-histedit-outgoing.t |
|
159 | 160 | test-histedit-templates.t |
|
160 | 161 | test-http-branchmap.t |
|
161 | 162 | test-http-bundle1.t |
|
162 | 163 | test-http-clone-r.t |
|
163 | 164 | test-identify.t |
|
164 | 165 | test-import-unknown.t |
|
165 | 166 | test-imports-checker.t |
|
166 | 167 | test-inherit-mode.t |
|
167 | 168 | test-issue1089.t |
|
168 | 169 | test-issue1102.t |
|
169 | 170 | test-issue1175.t |
|
170 | 171 | test-issue1306.t |
|
171 | 172 | test-issue1438.t |
|
172 | 173 | test-issue1502.t |
|
173 | 174 | test-issue1802.t |
|
174 | 175 | test-issue1877.t |
|
175 | 176 | test-issue1993.t |
|
176 | 177 | test-issue2137.t |
|
177 | 178 | test-issue3084.t |
|
178 | 179 | test-issue4074.t |
|
179 | 180 | test-issue522.t |
|
180 | 181 | test-issue586.t |
|
181 | 182 | test-issue612.t |
|
182 | 183 | test-issue619.t |
|
183 | 184 | test-issue672.t |
|
184 | 185 | test-issue842.t |
|
185 | 186 | test-journal-exists.t |
|
186 | 187 | test-largefiles-cache.t |
|
187 | 188 | test-largefiles-misc.t |
|
188 | 189 | test-largefiles-small-disk.t |
|
189 | 190 | test-largefiles-update.t |
|
190 | 191 | test-lfs-largefiles.t |
|
191 | 192 | test-locate.t |
|
192 | 193 | test-lock-badness.t |
|
193 | 194 | test-log.t |
|
194 | 195 | test-logexchange.t |
|
195 | 196 | test-lrucachedict.py |
|
196 | 197 | test-mactext.t |
|
197 | 198 | test-manifest-merging.t |
|
198 | 199 | test-manifest.py |
|
199 | 200 | test-manifest.t |
|
200 | 201 | test-match.py |
|
201 | 202 | test-mdiff.py |
|
202 | 203 | test-merge-changedelete.t |
|
203 | 204 | test-merge-closedheads.t |
|
204 | 205 | test-merge-commit.t |
|
205 | 206 | test-merge-criss-cross.t |
|
206 | 207 | test-merge-default.t |
|
207 | 208 | test-merge-force.t |
|
208 | 209 | test-merge-halt.t |
|
209 | 210 | test-merge-internal-tools-pattern.t |
|
210 | 211 | test-merge-local.t |
|
211 | 212 | test-merge-remove.t |
|
212 | 213 | test-merge-revert.t |
|
213 | 214 | test-merge-revert2.t |
|
214 | 215 | test-merge-subrepos.t |
|
215 | 216 | test-merge-symlinks.t |
|
216 | 217 | test-merge-types.t |
|
217 | 218 | test-merge1.t |
|
218 | 219 | test-merge10.t |
|
219 | 220 | test-merge2.t |
|
220 | 221 | test-merge4.t |
|
221 | 222 | test-merge5.t |
|
222 | 223 | test-merge6.t |
|
223 | 224 | test-merge7.t |
|
224 | 225 | test-merge8.t |
|
225 | 226 | test-merge9.t |
|
226 | 227 | test-mq-git.t |
|
227 | 228 | test-mq-header-date.t |
|
228 | 229 | test-mq-header-from.t |
|
229 | 230 | test-mq-pull-from-bundle.t |
|
230 | 231 | test-mq-qdiff.t |
|
231 | 232 | test-mq-qfold.t |
|
232 | 233 | test-mq-qgoto.t |
|
233 | 234 | test-mq-qimport-fail-cleanup.t |
|
234 | 235 | test-mq-qpush-exact.t |
|
235 | 236 | test-mq-qqueue.t |
|
236 | 237 | test-mq-qrefresh-interactive.t |
|
237 | 238 | test-mq-qrefresh-replace-log-message.t |
|
238 | 239 | test-mq-qrefresh.t |
|
239 | 240 | test-mq-qrename.t |
|
240 | 241 | test-mq-qsave.t |
|
241 | 242 | test-mq-safety.t |
|
242 | 243 | test-mq-subrepo.t |
|
243 | 244 | test-mq-symlinks.t |
|
244 | 245 | test-mv-cp-st-diff.t |
|
245 | 246 | test-narrow-archive.t |
|
246 | 247 | test-narrow-clone-no-ellipsis.t |
|
247 | 248 | test-narrow-clone-nonlinear.t |
|
248 | 249 | test-narrow-clone.t |
|
249 | 250 | test-narrow-commit.t |
|
250 | 251 | test-narrow-copies.t |
|
251 | 252 | test-narrow-debugcommands.t |
|
252 | 253 | test-narrow-debugrebuilddirstate.t |
|
253 | 254 | test-narrow-exchange-merges.t |
|
254 | 255 | test-narrow-exchange.t |
|
255 | 256 | test-narrow-expanddirstate.t |
|
256 | 257 | test-narrow-merge.t |
|
257 | 258 | test-narrow-patch.t |
|
258 | 259 | test-narrow-patterns.t |
|
259 | 260 | test-narrow-pull.t |
|
260 | 261 | test-narrow-rebase.t |
|
261 | 262 | test-narrow-shallow-merges.t |
|
262 | 263 | test-narrow-shallow.t |
|
263 | 264 | test-narrow-strip.t |
|
264 | 265 | test-narrow-update.t |
|
265 | 266 | test-nested-repo.t |
|
266 | 267 | test-newbranch.t |
|
267 | 268 | test-obshistory.t |
|
268 | 269 | test-obsmarker-template.t |
|
269 | 270 | test-obsmarkers-effectflag.t |
|
270 | 271 | test-obsolete-bundle-strip.t |
|
271 | 272 | test-obsolete-changeset-exchange.t |
|
272 | 273 | test-obsolete-checkheads.t |
|
273 | 274 | test-obsolete-distributed.t |
|
274 | 275 | test-obsolete-tag-cache.t |
|
275 | 276 | test-parents.t |
|
276 | 277 | test-pathconflicts-merge.t |
|
277 | 278 | test-pathconflicts-update.t |
|
278 | 279 | test-pending.t |
|
279 | 280 | test-permissions.t |
|
280 | 281 | test-phases.t |
|
281 | 282 | test-pull-branch.t |
|
282 | 283 | test-pull-http.t |
|
283 | 284 | test-pull-permission.t |
|
284 | 285 | test-pull-pull-corruption.t |
|
285 | 286 | test-pull-r.t |
|
286 | 287 | test-pull-update.t |
|
287 | 288 | test-purge.t |
|
288 | 289 | test-push-checkheads-partial-C1.t |
|
289 | 290 | test-push-checkheads-partial-C2.t |
|
290 | 291 | test-push-checkheads-partial-C3.t |
|
291 | 292 | test-push-checkheads-partial-C4.t |
|
292 | 293 | test-push-checkheads-pruned-B1.t |
|
293 | 294 | test-push-checkheads-pruned-B2.t |
|
294 | 295 | test-push-checkheads-pruned-B3.t |
|
295 | 296 | test-push-checkheads-pruned-B4.t |
|
296 | 297 | test-push-checkheads-pruned-B5.t |
|
297 | 298 | test-push-checkheads-pruned-B6.t |
|
298 | 299 | test-push-checkheads-pruned-B7.t |
|
299 | 300 | test-push-checkheads-pruned-B8.t |
|
300 | 301 | test-push-checkheads-superceed-A1.t |
|
301 | 302 | test-push-checkheads-superceed-A2.t |
|
302 | 303 | test-push-checkheads-superceed-A3.t |
|
303 | 304 | test-push-checkheads-superceed-A4.t |
|
304 | 305 | test-push-checkheads-superceed-A5.t |
|
305 | 306 | test-push-checkheads-superceed-A6.t |
|
306 | 307 | test-push-checkheads-superceed-A7.t |
|
307 | 308 | test-push-checkheads-superceed-A8.t |
|
308 | 309 | test-push-checkheads-unpushed-D1.t |
|
309 | 310 | test-push-checkheads-unpushed-D2.t |
|
310 | 311 | test-push-checkheads-unpushed-D3.t |
|
311 | 312 | test-push-checkheads-unpushed-D4.t |
|
312 | 313 | test-push-checkheads-unpushed-D5.t |
|
313 | 314 | test-push-checkheads-unpushed-D6.t |
|
314 | 315 | test-push-checkheads-unpushed-D7.t |
|
315 | 316 | test-push-http.t |
|
316 | 317 | test-push-warn.t |
|
317 | 318 | test-pushvars.t |
|
318 | 319 | test-rebase-abort.t |
|
319 | 320 | test-rebase-base-flag.t |
|
320 | 321 | test-rebase-bookmarks.t |
|
321 | 322 | test-rebase-brute-force.t |
|
322 | 323 | test-rebase-cache.t |
|
323 | 324 | test-rebase-check-restore.t |
|
324 | 325 | test-rebase-collapse.t |
|
325 | 326 | test-rebase-dest.t |
|
326 | 327 | test-rebase-detach.t |
|
327 | 328 | test-rebase-emptycommit.t |
|
328 | 329 | test-rebase-inmemory.t |
|
329 | 330 | test-rebase-interruptions.t |
|
330 | 331 | test-rebase-issue-noparam-single-rev.t |
|
331 | 332 | test-rebase-legacy.t |
|
332 | 333 | test-rebase-mq-skip.t |
|
333 | 334 | test-rebase-named-branches.t |
|
334 | 335 | test-rebase-newancestor.t |
|
335 | 336 | test-rebase-obsolete.t |
|
336 | 337 | test-rebase-parameters.t |
|
337 | 338 | test-rebase-partial.t |
|
338 | 339 | test-rebase-pull.t |
|
339 | 340 | test-rebase-rename.t |
|
340 | 341 | test-rebase-scenario-global.t |
|
341 | 342 | test-rebase-templates.t |
|
342 | 343 | test-rebase-transaction.t |
|
343 | 344 | test-record.t |
|
344 | 345 | test-relink.t |
|
345 | 346 | test-remove.t |
|
346 | 347 | test-rename-after-merge.t |
|
347 | 348 | test-rename-dir-merge.t |
|
348 | 349 | test-rename-merge1.t |
|
349 | 350 | test-rename.t |
|
350 | 351 | test-repair-strip.t |
|
351 | 352 | test-repo-compengines.t |
|
352 | 353 | test-resolve.t |
|
353 | 354 | test-revert-flags.t |
|
354 | 355 | test-revert-unknown.t |
|
355 | 356 | test-revlog-ancestry.py |
|
356 | 357 | test-revlog-group-emptyiter.t |
|
357 | 358 | test-revlog-mmapindex.t |
|
358 | 359 | test-revlog-packentry.t |
|
359 | 360 | test-revset-dirstate-parents.t |
|
360 | 361 | test-revset-outgoing.t |
|
361 | 362 | test-rollback.t |
|
362 | 363 | test-run-tests.py |
|
363 | 364 | test-schemes.t |
|
364 | 365 | test-serve.t |
|
365 | 366 | test-share.t |
|
366 | 367 | test-show-stack.t |
|
367 | 368 | test-show-work.t |
|
368 | 369 | test-show.t |
|
369 | 370 | test-simple-update.t |
|
370 | 371 | test-single-head.t |
|
371 | 372 | test-sparse-clear.t |
|
372 | 373 | test-sparse-merges.t |
|
373 | 374 | test-sparse-requirement.t |
|
374 | 375 | test-sparse-verbose-json.t |
|
375 | 376 | test-ssh-clone-r.t |
|
376 | 377 | test-ssh-proto.t |
|
377 | 378 | test-sshserver.py |
|
378 | 379 | test-status-rev.t |
|
379 | 380 | test-status-terse.t |
|
380 | 381 | test-strip-cross.t |
|
381 | 382 | test-strip.t |
|
382 | 383 | test-subrepo-deep-nested-change.t |
|
383 | 384 | test-subrepo.t |
|
384 | 385 | test-symlinks.t |
|
385 | 386 | test-tag.t |
|
386 | 387 | test-tags.t |
|
387 | 388 | test-treemanifest.t |
|
388 | 389 | test-unamend.t |
|
389 | 390 | test-uncommit.t |
|
390 | 391 | test-unified-test.t |
|
391 | 392 | test-unrelated-pull.t |
|
392 | 393 | test-up-local-change.t |
|
393 | 394 | test-update-branches.t |
|
394 | 395 | test-update-dest.t |
|
395 | 396 | test-update-issue1456.t |
|
396 | 397 | test-update-names.t |
|
397 | 398 | test-update-reverse.t |
|
398 | 399 | test-upgrade-repo.t |
|
399 | 400 | test-url-rev.t |
|
400 | 401 | test-username-newline.t |
|
401 | 402 | test-verify.t |
|
402 | 403 | test-websub.t |
|
403 | 404 | test-win32text.t |
|
404 | 405 | test-xdg.t |
@@ -1,671 +1,671 | |||
|
1 | 1 | $ hg init |
|
2 | 2 | |
|
3 | 3 | |
|
4 | 4 | committing changes |
|
5 | 5 | |
|
6 | 6 | $ count=0 |
|
7 | 7 | $ echo > a |
|
8 | 8 | $ while test $count -lt 32 ; do |
|
9 | 9 | > echo 'a' >> a |
|
10 | 10 | > test $count -eq 0 && hg add |
|
11 | 11 | > hg ci -m "msg $count" -d "$count 0" |
|
12 | 12 | > count=`expr $count + 1` |
|
13 | 13 | > done |
|
14 | 14 | adding a |
|
15 | 15 | |
|
16 | 16 | |
|
17 | 17 | $ hg log |
|
18 | 18 | changeset: 31:58c80a7c8a40 |
|
19 | 19 | tag: tip |
|
20 | 20 | user: test |
|
21 | 21 | date: Thu Jan 01 00:00:31 1970 +0000 |
|
22 | 22 | summary: msg 31 |
|
23 | 23 | |
|
24 | 24 | changeset: 30:ed2d2f24b11c |
|
25 | 25 | user: test |
|
26 | 26 | date: Thu Jan 01 00:00:30 1970 +0000 |
|
27 | 27 | summary: msg 30 |
|
28 | 28 | |
|
29 | 29 | changeset: 29:b5bd63375ab9 |
|
30 | 30 | user: test |
|
31 | 31 | date: Thu Jan 01 00:00:29 1970 +0000 |
|
32 | 32 | summary: msg 29 |
|
33 | 33 | |
|
34 | 34 | changeset: 28:8e0c2264c8af |
|
35 | 35 | user: test |
|
36 | 36 | date: Thu Jan 01 00:00:28 1970 +0000 |
|
37 | 37 | summary: msg 28 |
|
38 | 38 | |
|
39 | 39 | changeset: 27:288867a866e9 |
|
40 | 40 | user: test |
|
41 | 41 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
42 | 42 | summary: msg 27 |
|
43 | 43 | |
|
44 | 44 | changeset: 26:3efc6fd51aeb |
|
45 | 45 | user: test |
|
46 | 46 | date: Thu Jan 01 00:00:26 1970 +0000 |
|
47 | 47 | summary: msg 26 |
|
48 | 48 | |
|
49 | 49 | changeset: 25:02a84173a97a |
|
50 | 50 | user: test |
|
51 | 51 | date: Thu Jan 01 00:00:25 1970 +0000 |
|
52 | 52 | summary: msg 25 |
|
53 | 53 | |
|
54 | 54 | changeset: 24:10e0acd3809e |
|
55 | 55 | user: test |
|
56 | 56 | date: Thu Jan 01 00:00:24 1970 +0000 |
|
57 | 57 | summary: msg 24 |
|
58 | 58 | |
|
59 | 59 | changeset: 23:5ec79163bff4 |
|
60 | 60 | user: test |
|
61 | 61 | date: Thu Jan 01 00:00:23 1970 +0000 |
|
62 | 62 | summary: msg 23 |
|
63 | 63 | |
|
64 | 64 | changeset: 22:06c7993750ce |
|
65 | 65 | user: test |
|
66 | 66 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
67 | 67 | summary: msg 22 |
|
68 | 68 | |
|
69 | 69 | changeset: 21:e5db6aa3fe2a |
|
70 | 70 | user: test |
|
71 | 71 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
72 | 72 | summary: msg 21 |
|
73 | 73 | |
|
74 | 74 | changeset: 20:7128fb4fdbc9 |
|
75 | 75 | user: test |
|
76 | 76 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
77 | 77 | summary: msg 20 |
|
78 | 78 | |
|
79 | 79 | changeset: 19:52798545b482 |
|
80 | 80 | user: test |
|
81 | 81 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
82 | 82 | summary: msg 19 |
|
83 | 83 | |
|
84 | 84 | changeset: 18:86977a90077e |
|
85 | 85 | user: test |
|
86 | 86 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
87 | 87 | summary: msg 18 |
|
88 | 88 | |
|
89 | 89 | changeset: 17:03515f4a9080 |
|
90 | 90 | user: test |
|
91 | 91 | date: Thu Jan 01 00:00:17 1970 +0000 |
|
92 | 92 | summary: msg 17 |
|
93 | 93 | |
|
94 | 94 | changeset: 16:a2e6ea4973e9 |
|
95 | 95 | user: test |
|
96 | 96 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
97 | 97 | summary: msg 16 |
|
98 | 98 | |
|
99 | 99 | changeset: 15:e7fa0811edb0 |
|
100 | 100 | user: test |
|
101 | 101 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
102 | 102 | summary: msg 15 |
|
103 | 103 | |
|
104 | 104 | changeset: 14:ce8f0998e922 |
|
105 | 105 | user: test |
|
106 | 106 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
107 | 107 | summary: msg 14 |
|
108 | 108 | |
|
109 | 109 | changeset: 13:9d7d07bc967c |
|
110 | 110 | user: test |
|
111 | 111 | date: Thu Jan 01 00:00:13 1970 +0000 |
|
112 | 112 | summary: msg 13 |
|
113 | 113 | |
|
114 | 114 | changeset: 12:1941b52820a5 |
|
115 | 115 | user: test |
|
116 | 116 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
117 | 117 | summary: msg 12 |
|
118 | 118 | |
|
119 | 119 | changeset: 11:7b4cd9578619 |
|
120 | 120 | user: test |
|
121 | 121 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
122 | 122 | summary: msg 11 |
|
123 | 123 | |
|
124 | 124 | changeset: 10:7c5eff49a6b6 |
|
125 | 125 | user: test |
|
126 | 126 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
127 | 127 | summary: msg 10 |
|
128 | 128 | |
|
129 | 129 | changeset: 9:eb44510ef29a |
|
130 | 130 | user: test |
|
131 | 131 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
132 | 132 | summary: msg 9 |
|
133 | 133 | |
|
134 | 134 | changeset: 8:453eb4dba229 |
|
135 | 135 | user: test |
|
136 | 136 | date: Thu Jan 01 00:00:08 1970 +0000 |
|
137 | 137 | summary: msg 8 |
|
138 | 138 | |
|
139 | 139 | changeset: 7:03750880c6b5 |
|
140 | 140 | user: test |
|
141 | 141 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
142 | 142 | summary: msg 7 |
|
143 | 143 | |
|
144 | 144 | changeset: 6:a3d5c6fdf0d3 |
|
145 | 145 | user: test |
|
146 | 146 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
147 | 147 | summary: msg 6 |
|
148 | 148 | |
|
149 | 149 | changeset: 5:7874a09ea728 |
|
150 | 150 | user: test |
|
151 | 151 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
152 | 152 | summary: msg 5 |
|
153 | 153 | |
|
154 | 154 | changeset: 4:9b2ba8336a65 |
|
155 | 155 | user: test |
|
156 | 156 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
157 | 157 | summary: msg 4 |
|
158 | 158 | |
|
159 | 159 | changeset: 3:b53bea5e2fcb |
|
160 | 160 | user: test |
|
161 | 161 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
162 | 162 | summary: msg 3 |
|
163 | 163 | |
|
164 | 164 | changeset: 2:db07c04beaca |
|
165 | 165 | user: test |
|
166 | 166 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
167 | 167 | summary: msg 2 |
|
168 | 168 | |
|
169 | 169 | changeset: 1:5cd978ea5149 |
|
170 | 170 | user: test |
|
171 | 171 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
172 | 172 | summary: msg 1 |
|
173 | 173 | |
|
174 | 174 | changeset: 0:b99c7b9c8e11 |
|
175 | 175 | user: test |
|
176 | 176 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
177 | 177 | summary: msg 0 |
|
178 | 178 | |
|
179 | 179 | |
|
180 | 180 | $ hg up -C |
|
181 | 181 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
182 | 182 | |
|
183 | 183 | bisect test |
|
184 | 184 | |
|
185 | 185 | $ hg bisect -r |
|
186 | 186 | $ hg bisect -b |
|
187 | 187 | $ hg status -v |
|
188 | 188 | # The repository is in an unfinished *bisect* state. |
|
189 | 189 | |
|
190 | 190 | # To mark the changeset good: hg bisect --good |
|
191 | 191 | # To mark the changeset bad: hg bisect --bad |
|
192 | 192 | # To abort: hg bisect --reset |
|
193 | 193 | |
|
194 | 194 | $ hg status -v --config commands.status.skipstates=bisect |
|
195 | 195 | $ hg summary |
|
196 | 196 | parent: 31:58c80a7c8a40 tip |
|
197 | 197 | msg 31 |
|
198 | 198 | branch: default |
|
199 | 199 | commit: (clean) |
|
200 | 200 | update: (current) |
|
201 | 201 | phases: 32 draft |
|
202 | 202 | $ hg bisect -g 1 |
|
203 | 203 | Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) |
|
204 | 204 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 | 205 | $ hg bisect -g |
|
206 | 206 | Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests) |
|
207 | 207 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
208 | 208 | |
|
209 | 209 | skip |
|
210 | 210 | |
|
211 | 211 | $ hg bisect -s |
|
212 | 212 | Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests) |
|
213 | 213 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
214 | 214 | $ hg bisect -g |
|
215 | 215 | Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests) |
|
216 | 216 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
217 | 217 | $ hg bisect -g |
|
218 | 218 | Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests) |
|
219 | 219 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
220 | 220 | $ hg bisect -b |
|
221 | 221 | Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests) |
|
222 | 222 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
223 | 223 | $ hg bisect -g |
|
224 | 224 | The first bad revision is: |
|
225 | 225 | changeset: 29:b5bd63375ab9 |
|
226 | 226 | user: test |
|
227 | 227 | date: Thu Jan 01 00:00:29 1970 +0000 |
|
228 | 228 | summary: msg 29 |
|
229 | 229 | |
|
230 | 230 | |
|
231 | 231 | mark revsets instead of single revs |
|
232 | 232 | |
|
233 | 233 | $ hg bisect -r |
|
234 | 234 | $ hg bisect -b "0::3" |
|
235 | 235 | $ hg bisect -s "13::16" |
|
236 | 236 | $ hg bisect -g "26::tip" |
|
237 | 237 | Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests) |
|
238 | 238 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
239 | 239 | $ cat .hg/bisect.state |
|
240 | 240 | bad b99c7b9c8e11558adef3fad9af211c58d46f325b |
|
241 | 241 | bad 5cd978ea51499179507ee7b6f340d2dbaa401185 |
|
242 | 242 | bad db07c04beaca44cf24832541e7f4a2346a95275b |
|
243 | 243 | bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b |
|
244 | 244 | current 1941b52820a544549596820a8ae006842b0e2c64 |
|
245 | 245 | good 3efc6fd51aeb8594398044c6c846ca59ae021203 |
|
246 | 246 | good 288867a866e9adb7a29880b66936c874b80f4651 |
|
247 | 247 | good 8e0c2264c8af790daf3585ada0669d93dee09c83 |
|
248 | 248 | good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8 |
|
249 | 249 | good ed2d2f24b11c368fa8aa0da9f4e1db580abade59 |
|
250 | 250 | good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96 |
|
251 | 251 | skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991 |
|
252 | 252 | skip ce8f0998e922c179e80819d5066fbe46e2998784 |
|
253 | 253 | skip e7fa0811edb063f6319531f0d0a865882138e180 |
|
254 | 254 | skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3 |
|
255 | 255 | |
|
256 | 256 | bisect reverse test |
|
257 | 257 | |
|
258 | 258 | $ hg bisect -r |
|
259 | 259 | $ hg bisect -b null |
|
260 | 260 | $ hg bisect -g tip |
|
261 | 261 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) |
|
262 | 262 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
263 | 263 | $ hg bisect -g |
|
264 | 264 | Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests) |
|
265 | 265 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
266 | 266 | |
|
267 | 267 | skip |
|
268 | 268 | |
|
269 | 269 | $ hg bisect -s |
|
270 | 270 | Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests) |
|
271 | 271 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
272 | 272 | $ hg bisect -g |
|
273 | 273 | Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests) |
|
274 | 274 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
275 | 275 | $ hg bisect -g |
|
276 | 276 | Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests) |
|
277 | 277 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
278 | 278 | $ hg bisect -b |
|
279 | 279 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) |
|
280 | 280 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
281 | 281 | $ hg bisect -g |
|
282 | 282 | The first good revision is: |
|
283 | 283 | changeset: 1:5cd978ea5149 |
|
284 | 284 | user: test |
|
285 | 285 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
286 | 286 | summary: msg 1 |
|
287 | 287 | |
|
288 | 288 | |
|
289 | 289 | $ hg bisect -r |
|
290 | 290 | $ hg bisect -g tip |
|
291 | 291 | $ hg bisect -b tip |
|
292 | 292 | abort: inconsistent state, 31:58c80a7c8a40 is good and bad |
|
293 | 293 | [255] |
|
294 | 294 | |
|
295 | 295 | $ hg bisect -r |
|
296 | 296 | $ hg bisect -g null |
|
297 | 297 | $ hg bisect -bU tip |
|
298 | 298 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) |
|
299 | 299 | $ hg id |
|
300 | 300 | 5cd978ea5149 |
|
301 | 301 | |
|
302 | 302 | |
|
303 | 303 | Issue1228: hg bisect crashes when you skip the last rev in bisection |
|
304 | 304 | Issue1182: hg bisect exception |
|
305 | 305 | |
|
306 | 306 | $ hg bisect -r |
|
307 | 307 | $ hg bisect -b 4 |
|
308 | 308 | $ hg bisect -g 0 |
|
309 | 309 | Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) |
|
310 | 310 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
311 | 311 | $ hg bisect -s |
|
312 | 312 | Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests) |
|
313 | 313 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
314 | 314 | $ hg bisect -s |
|
315 | 315 | Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests) |
|
316 | 316 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
317 | 317 | $ hg bisect -s |
|
318 | 318 | Due to skipped revisions, the first bad revision could be any of: |
|
319 | 319 | changeset: 1:5cd978ea5149 |
|
320 | 320 | user: test |
|
321 | 321 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
322 | 322 | summary: msg 1 |
|
323 | 323 | |
|
324 | 324 | changeset: 2:db07c04beaca |
|
325 | 325 | user: test |
|
326 | 326 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
327 | 327 | summary: msg 2 |
|
328 | 328 | |
|
329 | 329 | changeset: 3:b53bea5e2fcb |
|
330 | 330 | user: test |
|
331 | 331 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
332 | 332 | summary: msg 3 |
|
333 | 333 | |
|
334 | 334 | changeset: 4:9b2ba8336a65 |
|
335 | 335 | user: test |
|
336 | 336 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
337 | 337 | summary: msg 4 |
|
338 | 338 | |
|
339 | 339 | |
|
340 | 340 | |
|
341 | 341 | reproduce non converging bisect, issue1182 |
|
342 | 342 | |
|
343 | 343 | $ hg bisect -r |
|
344 | 344 | $ hg bisect -g 0 |
|
345 | 345 | $ hg bisect -b 2 |
|
346 | 346 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) |
|
347 | 347 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
348 | 348 | $ hg bisect -s |
|
349 | 349 | Due to skipped revisions, the first bad revision could be any of: |
|
350 | 350 | changeset: 1:5cd978ea5149 |
|
351 | 351 | user: test |
|
352 | 352 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
353 | 353 | summary: msg 1 |
|
354 | 354 | |
|
355 | 355 | changeset: 2:db07c04beaca |
|
356 | 356 | user: test |
|
357 | 357 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
358 | 358 | summary: msg 2 |
|
359 | 359 | |
|
360 | 360 | |
|
361 | 361 | |
|
362 | 362 | test no action |
|
363 | 363 | |
|
364 | 364 | $ hg bisect -r |
|
365 | 365 | $ hg bisect |
|
366 | 366 | abort: cannot bisect (no known good revisions) |
|
367 | 367 | [255] |
|
368 | 368 | |
|
369 | 369 | |
|
370 | 370 | reproduce AssertionError, issue1445 |
|
371 | 371 | |
|
372 | 372 | $ hg bisect -r |
|
373 | 373 | $ hg bisect -b 6 |
|
374 | 374 | $ hg bisect -g 0 |
|
375 | 375 | Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) |
|
376 | 376 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
377 | 377 | $ hg bisect -s |
|
378 | 378 | Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests) |
|
379 | 379 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
380 | 380 | $ hg bisect -s |
|
381 | 381 | Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests) |
|
382 | 382 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
383 | 383 | $ hg bisect -s |
|
384 | 384 | Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests) |
|
385 | 385 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
386 | 386 | $ hg bisect -s |
|
387 | 387 | Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests) |
|
388 | 388 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
389 | 389 | $ hg bisect -g |
|
390 | 390 | The first bad revision is: |
|
391 | 391 | changeset: 6:a3d5c6fdf0d3 |
|
392 | 392 | user: test |
|
393 | 393 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
394 | 394 | summary: msg 6 |
|
395 | 395 | |
|
396 | 396 | $ hg log -r "bisect(good)" |
|
397 | 397 | changeset: 0:b99c7b9c8e11 |
|
398 | 398 | user: test |
|
399 | 399 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
400 | 400 | summary: msg 0 |
|
401 | 401 | |
|
402 | 402 | changeset: 5:7874a09ea728 |
|
403 | 403 | user: test |
|
404 | 404 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
405 | 405 | summary: msg 5 |
|
406 | 406 | |
|
407 | 407 | $ hg log -r "bisect(bad)" |
|
408 | 408 | changeset: 6:a3d5c6fdf0d3 |
|
409 | 409 | user: test |
|
410 | 410 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
411 | 411 | summary: msg 6 |
|
412 | 412 | |
|
413 | 413 | $ hg log -r "bisect(current)" |
|
414 | 414 | changeset: 5:7874a09ea728 |
|
415 | 415 | user: test |
|
416 | 416 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
417 | 417 | summary: msg 5 |
|
418 | 418 | |
|
419 | 419 | $ hg log -r "bisect(skip)" |
|
420 | 420 | changeset: 1:5cd978ea5149 |
|
421 | 421 | user: test |
|
422 | 422 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
423 | 423 | summary: msg 1 |
|
424 | 424 | |
|
425 | 425 | changeset: 2:db07c04beaca |
|
426 | 426 | user: test |
|
427 | 427 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
428 | 428 | summary: msg 2 |
|
429 | 429 | |
|
430 | 430 | changeset: 3:b53bea5e2fcb |
|
431 | 431 | user: test |
|
432 | 432 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
433 | 433 | summary: msg 3 |
|
434 | 434 | |
|
435 | 435 | changeset: 4:9b2ba8336a65 |
|
436 | 436 | user: test |
|
437 | 437 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
438 | 438 | summary: msg 4 |
|
439 | 439 | |
|
440 | 440 | |
|
441 | 441 | test legacy bisected() keyword |
|
442 | 442 | |
|
443 | 443 | $ hg log -r "bisected(bad)" |
|
444 | 444 | changeset: 6:a3d5c6fdf0d3 |
|
445 | 445 | user: test |
|
446 | 446 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
447 | 447 | summary: msg 6 |
|
448 | 448 | |
|
449 | 449 | |
|
450 | 450 | $ set +e |
|
451 | 451 | |
|
452 | 452 | test invalid command |
|
453 | 453 | assuming that the shell returns 127 if command not found ... |
|
454 | 454 | |
|
455 | 455 | $ hg bisect -r |
|
456 | 456 | $ hg bisect --command 'exit 127' |
|
457 | 457 | abort: failed to execute exit 127 |
|
458 | 458 | [255] |
|
459 | 459 | |
|
460 | 460 | |
|
461 | 461 | test bisecting command |
|
462 | 462 | |
|
463 | 463 | $ cat > script.py <<EOF |
|
464 | 464 | > #!$PYTHON |
|
465 | 465 | > from __future__ import absolute_import |
|
466 | 466 | > import sys |
|
467 | 467 | > from mercurial import hg, ui as uimod |
|
468 | > repo = hg.repository(uimod.ui.load(), '.') | |
|
469 | > if repo['.'].rev() < 6: | |
|
468 | > repo = hg.repository(uimod.ui.load(), b'.') | |
|
469 | > if repo[b'.'].rev() < 6: | |
|
470 | 470 | > sys.exit(1) |
|
471 | 471 | > EOF |
|
472 | 472 | $ chmod +x script.py |
|
473 | 473 | $ hg bisect -r |
|
474 | 474 | $ hg up -qr tip |
|
475 | 475 | $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" |
|
476 | 476 | changeset 31:58c80a7c8a40: good |
|
477 | 477 | abort: cannot bisect (no known bad revisions) |
|
478 | 478 | [255] |
|
479 | 479 | $ hg up -qr 0 |
|
480 | 480 | $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" |
|
481 | 481 | changeset 0:b99c7b9c8e11: bad |
|
482 | 482 | changeset 15:e7fa0811edb0: good |
|
483 | 483 | changeset 7:03750880c6b5: good |
|
484 | 484 | changeset 3:b53bea5e2fcb: bad |
|
485 | 485 | changeset 5:7874a09ea728: bad |
|
486 | 486 | changeset 6:a3d5c6fdf0d3: good |
|
487 | 487 | The first good revision is: |
|
488 | 488 | changeset: 6:a3d5c6fdf0d3 |
|
489 | 489 | user: test |
|
490 | 490 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
491 | 491 | summary: msg 6 |
|
492 | 492 | |
|
493 | 493 | |
|
494 | 494 | |
|
495 | 495 | test bisecting via a command without updating the working dir, and |
|
496 | 496 | ensure that the bisect state file is updated before running a test |
|
497 | 497 | command |
|
498 | 498 | |
|
499 | 499 | $ hg update null |
|
500 | 500 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
501 | 501 | $ cat > script.sh <<'EOF' |
|
502 | 502 | > #!/bin/sh |
|
503 | 503 | > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) |
|
504 | 504 | > current="`hg log -r \"bisect(current)\" --template {node}`" |
|
505 | 505 | > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127) |
|
506 | 506 | > rev="`hg log -r $HG_NODE --template {rev}`" |
|
507 | 507 | > test "$rev" -ge 6 |
|
508 | 508 | > EOF |
|
509 | 509 | $ chmod +x script.sh |
|
510 | 510 | $ hg bisect -r |
|
511 | 511 | $ hg bisect --good tip --noupdate |
|
512 | 512 | $ hg bisect --bad 0 --noupdate |
|
513 | 513 | Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) |
|
514 | 514 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate |
|
515 | 515 | changeset 15:e7fa0811edb0: good |
|
516 | 516 | changeset 7:03750880c6b5: good |
|
517 | 517 | changeset 3:b53bea5e2fcb: bad |
|
518 | 518 | changeset 5:7874a09ea728: bad |
|
519 | 519 | changeset 6:a3d5c6fdf0d3: good |
|
520 | 520 | The first good revision is: |
|
521 | 521 | changeset: 6:a3d5c6fdf0d3 |
|
522 | 522 | user: test |
|
523 | 523 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
524 | 524 | summary: msg 6 |
|
525 | 525 | |
|
526 | 526 | |
|
527 | 527 | ensure that we still don't have a working dir |
|
528 | 528 | |
|
529 | 529 | $ hg parents |
|
530 | 530 | |
|
531 | 531 | |
|
532 | 532 | test the same case, this time with updating |
|
533 | 533 | |
|
534 | 534 | $ cat > script.sh <<'EOF' |
|
535 | 535 | > #!/bin/sh |
|
536 | 536 | > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) |
|
537 | 537 | > current="`hg log -r \"bisect(current)\" --template {node}`" |
|
538 | 538 | > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127) |
|
539 | 539 | > rev="`hg log -r . --template {rev}`" |
|
540 | 540 | > test "$rev" -ge 6 |
|
541 | 541 | > EOF |
|
542 | 542 | $ chmod +x script.sh |
|
543 | 543 | $ hg bisect -r |
|
544 | 544 | $ hg up -qr tip |
|
545 | 545 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" |
|
546 | 546 | changeset 31:58c80a7c8a40: good |
|
547 | 547 | abort: cannot bisect (no known bad revisions) |
|
548 | 548 | [255] |
|
549 | 549 | $ hg up -qr 0 |
|
550 | 550 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" |
|
551 | 551 | changeset 0:b99c7b9c8e11: bad |
|
552 | 552 | changeset 15:e7fa0811edb0: good |
|
553 | 553 | changeset 7:03750880c6b5: good |
|
554 | 554 | changeset 3:b53bea5e2fcb: bad |
|
555 | 555 | changeset 5:7874a09ea728: bad |
|
556 | 556 | changeset 6:a3d5c6fdf0d3: good |
|
557 | 557 | The first good revision is: |
|
558 | 558 | changeset: 6:a3d5c6fdf0d3 |
|
559 | 559 | user: test |
|
560 | 560 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
561 | 561 | summary: msg 6 |
|
562 | 562 | |
|
563 | 563 | $ hg graft -q 15 |
|
564 | 564 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
565 | 565 | abort: unresolved conflicts, can't continue |
|
566 | 566 | (use 'hg resolve' and 'hg graft --continue') |
|
567 | 567 | [255] |
|
568 | 568 | $ hg bisect --reset |
|
569 | 569 | $ hg up -C . |
|
570 | 570 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
571 | 571 | |
|
572 | 572 | Check that bisect does not break on obsolete changesets |
|
573 | 573 | ========================================================= |
|
574 | 574 | |
|
575 | 575 | $ cat >> $HGRCPATH << EOF |
|
576 | 576 | > [experimental] |
|
577 | 577 | > evolution.createmarkers=True |
|
578 | 578 | > EOF |
|
579 | 579 | |
|
580 | 580 | tip is obsolete |
|
581 | 581 | --------------------- |
|
582 | 582 | |
|
583 | 583 | $ hg debugobsolete `hg id --debug -i -r tip` |
|
584 | 584 | obsoleted 1 changesets |
|
585 | 585 | $ hg bisect --reset |
|
586 | 586 | $ hg bisect --good 15 |
|
587 | 587 | $ hg bisect --bad 30 |
|
588 | 588 | Testing changeset 22:06c7993750ce (15 changesets remaining, ~3 tests) |
|
589 | 589 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
590 | 590 | $ hg bisect --command true |
|
591 | 591 | changeset 22:06c7993750ce: good |
|
592 | 592 | changeset 26:3efc6fd51aeb: good |
|
593 | 593 | changeset 28:8e0c2264c8af: good |
|
594 | 594 | changeset 29:b5bd63375ab9: good |
|
595 | 595 | The first bad revision is: |
|
596 | 596 | changeset: 30:ed2d2f24b11c |
|
597 | 597 | tag: tip |
|
598 | 598 | user: test |
|
599 | 599 | date: Thu Jan 01 00:00:30 1970 +0000 |
|
600 | 600 | summary: msg 30 |
|
601 | 601 | |
|
602 | 602 | |
|
603 | 603 | Changeset in the bad:good range is obsolete |
|
604 | 604 | --------------------------------------------- |
|
605 | 605 | |
|
606 | 606 | $ hg up 30 |
|
607 | 607 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
608 | 608 | $ echo 'a' >> a |
|
609 | 609 | $ hg ci -m "msg 32" -d "32 0" |
|
610 | 610 | $ hg bisect --reset |
|
611 | 611 | $ hg bisect --good . |
|
612 | 612 | $ hg bisect --bad 25 |
|
613 | 613 | Testing changeset 28:8e0c2264c8af (6 changesets remaining, ~2 tests) |
|
614 | 614 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
615 | 615 | $ hg bisect --command true |
|
616 | 616 | changeset 28:8e0c2264c8af: good |
|
617 | 617 | changeset 26:3efc6fd51aeb: good |
|
618 | 618 | The first good revision is: |
|
619 | 619 | changeset: 26:3efc6fd51aeb |
|
620 | 620 | user: test |
|
621 | 621 | date: Thu Jan 01 00:00:26 1970 +0000 |
|
622 | 622 | summary: msg 26 |
|
623 | 623 | |
|
624 | 624 | Test the validation message when exclusive options are used: |
|
625 | 625 | |
|
626 | 626 | $ hg bisect -r |
|
627 | 627 | $ hg bisect -b -c false |
|
628 | 628 | abort: --bad and --command are incompatible |
|
629 | 629 | [255] |
|
630 | 630 | $ hg bisect -b -e |
|
631 | 631 | abort: --bad and --extend are incompatible |
|
632 | 632 | [255] |
|
633 | 633 | $ hg bisect -b -g |
|
634 | 634 | abort: --bad and --good are incompatible |
|
635 | 635 | [255] |
|
636 | 636 | $ hg bisect -b -r |
|
637 | 637 | abort: --bad and --reset are incompatible |
|
638 | 638 | [255] |
|
639 | 639 | $ hg bisect -b -s |
|
640 | 640 | abort: --bad and --skip are incompatible |
|
641 | 641 | [255] |
|
642 | 642 | $ hg bisect -c false -e |
|
643 | 643 | abort: --command and --extend are incompatible |
|
644 | 644 | [255] |
|
645 | 645 | $ hg bisect -c false -g |
|
646 | 646 | abort: --command and --good are incompatible |
|
647 | 647 | [255] |
|
648 | 648 | $ hg bisect -c false -r |
|
649 | 649 | abort: --command and --reset are incompatible |
|
650 | 650 | [255] |
|
651 | 651 | $ hg bisect -c false -s |
|
652 | 652 | abort: --command and --skip are incompatible |
|
653 | 653 | [255] |
|
654 | 654 | $ hg bisect -e -g |
|
655 | 655 | abort: --extend and --good are incompatible |
|
656 | 656 | [255] |
|
657 | 657 | $ hg bisect -e -r |
|
658 | 658 | abort: --extend and --reset are incompatible |
|
659 | 659 | [255] |
|
660 | 660 | $ hg bisect -e -s |
|
661 | 661 | abort: --extend and --skip are incompatible |
|
662 | 662 | [255] |
|
663 | 663 | $ hg bisect -g -r |
|
664 | 664 | abort: --good and --reset are incompatible |
|
665 | 665 | [255] |
|
666 | 666 | $ hg bisect -g -s |
|
667 | 667 | abort: --good and --skip are incompatible |
|
668 | 668 | [255] |
|
669 | 669 | $ hg bisect -r -s |
|
670 | 670 | abort: --reset and --skip are incompatible |
|
671 | 671 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now