Show More
@@ -1,608 +1,610 b'' | |||
|
1 | 1 | test-abort-checkin.t |
|
2 | 2 | test-absorb-filefixupstate.py |
|
3 | 3 | test-absorb-phase.t |
|
4 | 4 | test-absorb-rename.t |
|
5 | 5 | test-absorb-strip.t |
|
6 | 6 | test-absorb.t |
|
7 | 7 | test-add.t |
|
8 | 8 | test-addremove-similar.t |
|
9 | 9 | test-addremove.t |
|
10 | 10 | test-alias.t |
|
11 | 11 | test-amend-subrepo.t |
|
12 | 12 | test-amend.t |
|
13 | 13 | test-ancestor.py |
|
14 | 14 | test-annotate.py |
|
15 | 15 | test-annotate.t |
|
16 | 16 | test-archive-symlinks.t |
|
17 | 17 | test-atomictempfile.py |
|
18 | 18 | test-audit-path.t |
|
19 | 19 | test-audit-subrepo.t |
|
20 | 20 | test-automv.t |
|
21 | 21 | test-backout.t |
|
22 | 22 | test-backwards-remove.t |
|
23 | 23 | test-bad-pull.t |
|
24 | 24 | test-basic.t |
|
25 | 25 | test-bdiff.py |
|
26 | 26 | test-bheads.t |
|
27 | 27 | test-bisect.t |
|
28 | 28 | test-bisect2.t |
|
29 | 29 | test-bisect3.t |
|
30 | 30 | test-blackbox.t |
|
31 | 31 | test-bookmarks-current.t |
|
32 | 32 | test-bookmarks-merge.t |
|
33 | 33 | test-bookmarks-pushpull.t |
|
34 | 34 | test-bookmarks-rebase.t |
|
35 | 35 | test-bookmarks-strip.t |
|
36 | 36 | test-bookmarks.t |
|
37 | 37 | test-branch-change.t |
|
38 | 38 | test-branch-option.t |
|
39 | 39 | test-branch-tag-confict.t |
|
40 | 40 | test-branches.t |
|
41 | 41 | test-bundle-phases.t |
|
42 | 42 | test-bundle-r.t |
|
43 | 43 | test-bundle-type.t |
|
44 | 44 | test-bundle-vs-outgoing.t |
|
45 | 45 | test-bundle.t |
|
46 | 46 | test-bundle2-exchange.t |
|
47 | 47 | test-bundle2-format.t |
|
48 | 48 | test-bundle2-multiple-changegroups.t |
|
49 | 49 | test-bundle2-pushback.t |
|
50 | 50 | test-bundle2-remote-changegroup.t |
|
51 | 51 | test-cappedreader.py |
|
52 | 52 | test-casecollision.t |
|
53 | 53 | test-cat.t |
|
54 | 54 | test-cbor.py |
|
55 | 55 | test-censor.t |
|
56 | 56 | test-changelog-exec.t |
|
57 | 57 | test-check-code.t |
|
58 | 58 | test-check-commit.t |
|
59 | 59 | test-check-execute.t |
|
60 | 60 | test-check-interfaces.py |
|
61 | 61 | test-check-module-imports.t |
|
62 | 62 | test-check-py3-compat.t |
|
63 | 63 | test-check-pyflakes.t |
|
64 | 64 | test-check-pylint.t |
|
65 | 65 | test-check-shbang.t |
|
66 | 66 | test-children.t |
|
67 | 67 | test-clone-cgi.t |
|
68 | 68 | test-clone-pull-corruption.t |
|
69 | 69 | test-clone-r.t |
|
70 | 70 | test-clone-uncompressed.t |
|
71 | 71 | test-clone-update-order.t |
|
72 | 72 | test-clone.t |
|
73 | 73 | test-clonebundles.t |
|
74 | 74 | test-close-head.t |
|
75 | 75 | test-commit-amend.t |
|
76 | 76 | test-commit-interactive.t |
|
77 | 77 | test-commit-multiple.t |
|
78 | 78 | test-commit-unresolved.t |
|
79 | 79 | test-commit.t |
|
80 | 80 | test-committer.t |
|
81 | 81 | test-completion.t |
|
82 | 82 | test-config-env.py |
|
83 | 83 | test-config.t |
|
84 | 84 | test-conflict.t |
|
85 | 85 | test-confused-revert.t |
|
86 | 86 | test-context.py |
|
87 | 87 | test-contrib-check-code.t |
|
88 | 88 | test-contrib-check-commit.t |
|
89 | 89 | test-contrib-dumprevlog.t |
|
90 | 90 | test-contrib-perf.t |
|
91 | 91 | test-contrib-testparseutil.t |
|
92 | 92 | test-convert-authormap.t |
|
93 | 93 | test-convert-clonebranches.t |
|
94 | 94 | test-convert-cvs-branch.t |
|
95 | 95 | test-convert-cvs-detectmerge.t |
|
96 | 96 | test-convert-cvs-synthetic.t |
|
97 | 97 | test-convert-cvs.t |
|
98 | 98 | test-convert-cvsnt-mergepoints.t |
|
99 | 99 | test-convert-datesort.t |
|
100 | 100 | test-convert-filemap.t |
|
101 | 101 | test-convert-hg-sink.t |
|
102 | 102 | test-convert-hg-source.t |
|
103 | 103 | test-convert-hg-startrev.t |
|
104 | 104 | test-convert-splicemap.t |
|
105 | 105 | test-convert-tagsbranch-topology.t |
|
106 | 106 | test-copy-move-merge.t |
|
107 | 107 | test-copy.t |
|
108 | 108 | test-copytrace-heuristics.t |
|
109 | 109 | test-debugbuilddag.t |
|
110 | 110 | test-debugbundle.t |
|
111 | 111 | test-debugcommands.t |
|
112 | 112 | test-debugextensions.t |
|
113 | 113 | test-debugindexdot.t |
|
114 | 114 | test-debugrename.t |
|
115 | 115 | test-default-push.t |
|
116 | 116 | test-diff-antipatience.t |
|
117 | 117 | test-diff-binary-file.t |
|
118 | 118 | test-diff-change.t |
|
119 | 119 | test-diff-copy-depth.t |
|
120 | 120 | test-diff-hashes.t |
|
121 | 121 | test-diff-ignore-whitespace.t |
|
122 | 122 | test-diff-indent-heuristic.t |
|
123 | 123 | test-diff-issue2761.t |
|
124 | 124 | test-diff-newlines.t |
|
125 | 125 | test-diff-reverse.t |
|
126 | 126 | test-diff-subdir.t |
|
127 | 127 | test-diff-unified.t |
|
128 | 128 | test-diff-upgrade.t |
|
129 | 129 | test-diffdir.t |
|
130 | 130 | test-diffstat.t |
|
131 | 131 | test-directaccess.t |
|
132 | 132 | test-dirstate-backup.t |
|
133 | 133 | test-dirstate-nonnormalset.t |
|
134 | 134 | test-dirstate.t |
|
135 | 135 | test-dispatch.py |
|
136 | 136 | test-doctest.py |
|
137 | 137 | test-double-merge.t |
|
138 | 138 | test-drawdag.t |
|
139 | 139 | test-duplicateoptions.py |
|
140 | 140 | test-editor-filename.t |
|
141 | 141 | test-empty-dir.t |
|
142 | 142 | test-empty-file.t |
|
143 | 143 | test-empty-group.t |
|
144 | 144 | test-empty.t |
|
145 | 145 | test-encode.t |
|
146 | 146 | test-encoding-func.py |
|
147 | 147 | test-encoding.t |
|
148 | 148 | test-eol-add.t |
|
149 | 149 | test-eol-clone.t |
|
150 | 150 | test-eol-hook.t |
|
151 | 151 | test-eol-patch.t |
|
152 | 152 | test-eol-tag.t |
|
153 | 153 | test-eol-update.t |
|
154 | 154 | test-eol.t |
|
155 | 155 | test-eolfilename.t |
|
156 | 156 | test-excessive-merge.t |
|
157 | 157 | test-exchange-obsmarkers-case-A1.t |
|
158 | 158 | test-exchange-obsmarkers-case-A2.t |
|
159 | 159 | test-exchange-obsmarkers-case-A3.t |
|
160 | 160 | test-exchange-obsmarkers-case-A4.t |
|
161 | 161 | test-exchange-obsmarkers-case-A5.t |
|
162 | 162 | test-exchange-obsmarkers-case-A6.t |
|
163 | 163 | test-exchange-obsmarkers-case-A7.t |
|
164 | 164 | test-exchange-obsmarkers-case-B1.t |
|
165 | 165 | test-exchange-obsmarkers-case-B2.t |
|
166 | 166 | test-exchange-obsmarkers-case-B3.t |
|
167 | 167 | test-exchange-obsmarkers-case-B4.t |
|
168 | 168 | test-exchange-obsmarkers-case-B5.t |
|
169 | 169 | test-exchange-obsmarkers-case-B6.t |
|
170 | 170 | test-exchange-obsmarkers-case-B7.t |
|
171 | 171 | test-exchange-obsmarkers-case-C1.t |
|
172 | 172 | test-exchange-obsmarkers-case-C2.t |
|
173 | 173 | test-exchange-obsmarkers-case-C3.t |
|
174 | 174 | test-exchange-obsmarkers-case-C4.t |
|
175 | 175 | test-exchange-obsmarkers-case-D1.t |
|
176 | 176 | test-exchange-obsmarkers-case-D2.t |
|
177 | 177 | test-exchange-obsmarkers-case-D3.t |
|
178 | 178 | test-exchange-obsmarkers-case-D4.t |
|
179 | 179 | test-execute-bit.t |
|
180 | 180 | test-export.t |
|
181 | 181 | test-extdata.t |
|
182 | 182 | test-extdiff.t |
|
183 | 183 | test-extensions-afterloaded.t |
|
184 | 184 | test-extensions-wrapfunction.py |
|
185 | 185 | test-extra-filelog-entry.t |
|
186 | 186 | test-fetch.t |
|
187 | 187 | test-filebranch.t |
|
188 | 188 | test-filecache.py |
|
189 | 189 | test-filelog.py |
|
190 | 190 | test-fileset-generated.t |
|
191 | 191 | test-fileset.t |
|
192 | 192 | test-fix-topology.t |
|
193 | 193 | test-flags.t |
|
194 | 194 | test-generaldelta.t |
|
195 | 195 | test-getbundle.t |
|
196 | 196 | test-git-export.t |
|
197 | 197 | test-globalopts.t |
|
198 | 198 | test-glog-beautifygraph.t |
|
199 | 199 | test-glog-topological.t |
|
200 | 200 | test-glog.t |
|
201 | 201 | test-gpg.t |
|
202 | 202 | test-graft.t |
|
203 | 203 | test-grep.t |
|
204 | 204 | test-hg-parseurl.py |
|
205 | 205 | test-hghave.t |
|
206 | 206 | test-hgignore.t |
|
207 | 207 | test-hgk.t |
|
208 | 208 | test-hgrc.t |
|
209 | 209 | test-hgweb-annotate-whitespace.t |
|
210 | 210 | test-hgweb-bundle.t |
|
211 | 211 | test-hgweb-csp.t |
|
212 | 212 | test-hgweb-descend-empties.t |
|
213 | 213 | test-hgweb-diffs.t |
|
214 | 214 | test-hgweb-empty.t |
|
215 | 215 | test-hgweb-filelog.t |
|
216 | 216 | test-hgweb-non-interactive.t |
|
217 | 217 | test-hgweb-raw.t |
|
218 | 218 | test-hgweb-removed.t |
|
219 | 219 | test-hgweb.t |
|
220 | 220 | test-hgwebdir-paths.py |
|
221 | 221 | test-hgwebdirsym.t |
|
222 | 222 | test-histedit-arguments.t |
|
223 | 223 | test-histedit-base.t |
|
224 | 224 | test-histedit-bookmark-motion.t |
|
225 | 225 | test-histedit-commute.t |
|
226 | 226 | test-histedit-drop.t |
|
227 | 227 | test-histedit-edit.t |
|
228 | 228 | test-histedit-fold-non-commute.t |
|
229 | 229 | test-histedit-fold.t |
|
230 | 230 | test-histedit-no-backup.t |
|
231 | 231 | test-histedit-no-change.t |
|
232 | 232 | test-histedit-non-commute-abort.t |
|
233 | 233 | test-histedit-non-commute.t |
|
234 | 234 | test-histedit-obsolete.t |
|
235 | 235 | test-histedit-outgoing.t |
|
236 | 236 | test-histedit-templates.t |
|
237 | 237 | test-http-branchmap.t |
|
238 | 238 | test-http-bundle1.t |
|
239 | 239 | test-http-clone-r.t |
|
240 | 240 | test-http-permissions.t |
|
241 | 241 | test-http.t |
|
242 | 242 | test-hybridencode.py |
|
243 | 243 | test-i18n.t |
|
244 | 244 | test-identify.t |
|
245 | 245 | test-impexp-branch.t |
|
246 | 246 | test-import-bypass.t |
|
247 | 247 | test-import-eol.t |
|
248 | 248 | test-import-merge.t |
|
249 | 249 | test-import-unknown.t |
|
250 | 250 | test-import.t |
|
251 | 251 | test-imports-checker.t |
|
252 | 252 | test-incoming-outgoing.t |
|
253 | 253 | test-inherit-mode.t |
|
254 | 254 | test-init.t |
|
255 | 255 | test-issue1089.t |
|
256 | 256 | test-issue1102.t |
|
257 | 257 | test-issue1175.t |
|
258 | 258 | test-issue1306.t |
|
259 | 259 | test-issue1438.t |
|
260 | 260 | test-issue1502.t |
|
261 | 261 | test-issue1802.t |
|
262 | 262 | test-issue1877.t |
|
263 | 263 | test-issue1993.t |
|
264 | 264 | test-issue2137.t |
|
265 | 265 | test-issue3084.t |
|
266 | 266 | test-issue4074.t |
|
267 | 267 | test-issue522.t |
|
268 | 268 | test-issue586.t |
|
269 | 269 | test-issue5979.t |
|
270 | 270 | test-issue612.t |
|
271 | 271 | test-issue619.t |
|
272 | 272 | test-issue660.t |
|
273 | 273 | test-issue672.t |
|
274 | 274 | test-issue842.t |
|
275 | 275 | test-journal-exists.t |
|
276 | 276 | test-journal-share.t |
|
277 | 277 | test-journal.t |
|
278 | 278 | test-known.t |
|
279 | 279 | test-largefiles-cache.t |
|
280 | 280 | test-largefiles-misc.t |
|
281 | 281 | test-largefiles-small-disk.t |
|
282 | 282 | test-largefiles-update.t |
|
283 | 283 | test-largefiles.t |
|
284 | 284 | test-lfs-largefiles.t |
|
285 | 285 | test-lfs-pointer.py |
|
286 | 286 | test-linelog.py |
|
287 | 287 | test-linerange.py |
|
288 | 288 | test-locate.t |
|
289 | 289 | test-lock-badness.t |
|
290 | 290 | test-log-linerange.t |
|
291 | 291 | test-log.t |
|
292 | 292 | test-logexchange.t |
|
293 | 293 | test-lrucachedict.py |
|
294 | 294 | test-mactext.t |
|
295 | 295 | test-mailmap.t |
|
296 | 296 | test-manifest-merging.t |
|
297 | 297 | test-manifest.py |
|
298 | 298 | test-manifest.t |
|
299 | 299 | test-match.py |
|
300 | 300 | test-mdiff.py |
|
301 | 301 | test-merge-changedelete.t |
|
302 | 302 | test-merge-closedheads.t |
|
303 | 303 | test-merge-commit.t |
|
304 | 304 | test-merge-criss-cross.t |
|
305 | 305 | test-merge-default.t |
|
306 | 306 | test-merge-force.t |
|
307 | 307 | test-merge-halt.t |
|
308 | 308 | test-merge-internal-tools-pattern.t |
|
309 | 309 | test-merge-local.t |
|
310 | 310 | test-merge-no-file-change.t |
|
311 | 311 | test-merge-remove.t |
|
312 | 312 | test-merge-revert.t |
|
313 | 313 | test-merge-revert2.t |
|
314 | 314 | test-merge-subrepos.t |
|
315 | 315 | test-merge-symlinks.t |
|
316 | 316 | test-merge-tools.t |
|
317 | 317 | test-merge-types.t |
|
318 | 318 | test-merge1.t |
|
319 | 319 | test-merge10.t |
|
320 | 320 | test-merge2.t |
|
321 | 321 | test-merge4.t |
|
322 | 322 | test-merge5.t |
|
323 | 323 | test-merge6.t |
|
324 | 324 | test-merge7.t |
|
325 | 325 | test-merge8.t |
|
326 | 326 | test-merge9.t |
|
327 | 327 | test-minifileset.py |
|
328 | 328 | test-minirst.py |
|
329 | 329 | test-mq-git.t |
|
330 | 330 | test-mq-guards.t |
|
331 | 331 | test-mq-header-date.t |
|
332 | 332 | test-mq-header-from.t |
|
333 | 333 | test-mq-merge.t |
|
334 | 334 | test-mq-pull-from-bundle.t |
|
335 | 335 | test-mq-qclone-http.t |
|
336 | 336 | test-mq-qdelete.t |
|
337 | 337 | test-mq-qdiff.t |
|
338 | 338 | test-mq-qfold.t |
|
339 | 339 | test-mq-qgoto.t |
|
340 | 340 | test-mq-qimport-fail-cleanup.t |
|
341 | 341 | test-mq-qnew.t |
|
342 | 342 | test-mq-qpush-exact.t |
|
343 | 343 | test-mq-qpush-fail.t |
|
344 | 344 | test-mq-qqueue.t |
|
345 | 345 | test-mq-qrefresh-interactive.t |
|
346 | 346 | test-mq-qrefresh-replace-log-message.t |
|
347 | 347 | test-mq-qrefresh.t |
|
348 | 348 | test-mq-qrename.t |
|
349 | 349 | test-mq-qsave.t |
|
350 | 350 | test-mq-safety.t |
|
351 | 351 | test-mq-subrepo.t |
|
352 | 352 | test-mq-symlinks.t |
|
353 | 353 | test-mq.t |
|
354 | 354 | test-mv-cp-st-diff.t |
|
355 | 355 | test-narrow-acl.t |
|
356 | 356 | test-narrow-archive.t |
|
357 | 357 | test-narrow-clone-no-ellipsis.t |
|
358 | 358 | test-narrow-clone-non-narrow-server.t |
|
359 | 359 | test-narrow-clone-nonlinear.t |
|
360 | 360 | test-narrow-clone.t |
|
361 | 361 | test-narrow-commit.t |
|
362 | 362 | test-narrow-copies.t |
|
363 | 363 | test-narrow-debugcommands.t |
|
364 | 364 | test-narrow-debugrebuilddirstate.t |
|
365 | 365 | test-narrow-exchange-merges.t |
|
366 | 366 | test-narrow-exchange.t |
|
367 | 367 | test-narrow-expanddirstate.t |
|
368 | 368 | test-narrow-merge.t |
|
369 | 369 | test-narrow-patch.t |
|
370 | 370 | test-narrow-patterns.t |
|
371 | 371 | test-narrow-pull.t |
|
372 | 372 | test-narrow-rebase.t |
|
373 | 373 | test-narrow-shallow-merges.t |
|
374 | 374 | test-narrow-shallow.t |
|
375 | 375 | test-narrow-strip.t |
|
376 | 376 | test-narrow-trackedcmd.t |
|
377 | 377 | test-narrow-update.t |
|
378 | 378 | test-narrow-widen-no-ellipsis.t |
|
379 | 379 | test-narrow-widen.t |
|
380 | 380 | test-narrow.t |
|
381 | 381 | test-nested-repo.t |
|
382 | 382 | test-newbranch.t |
|
383 | 383 | test-newercgi.t |
|
384 | 384 | test-nointerrupt.t |
|
385 | 385 | test-obshistory.t |
|
386 | 386 | test-obsmarker-template.t |
|
387 | 387 | test-obsmarkers-effectflag.t |
|
388 | 388 | test-obsolete-bounds-checking.t |
|
389 | 389 | test-obsolete-bundle-strip.t |
|
390 | 390 | test-obsolete-changeset-exchange.t |
|
391 | 391 | test-obsolete-checkheads.t |
|
392 | 392 | test-obsolete-distributed.t |
|
393 | 393 | test-obsolete-divergent.t |
|
394 | 394 | test-obsolete-tag-cache.t |
|
395 | 395 | test-obsolete.t |
|
396 | test-origbackup-conflict.t | |
|
396 | 397 | test-pager-legacy.t |
|
397 | 398 | test-pager.t |
|
398 | 399 | test-parents.t |
|
399 | 400 | test-parseindex2.py |
|
400 | 401 | test-patch-offset.t |
|
401 | 402 | test-patch.t |
|
402 | 403 | test-patchbomb-bookmark.t |
|
403 | 404 | test-patchbomb-tls.t |
|
404 | 405 | test-patchbomb.t |
|
406 | test-pathconflicts-basic.t | |
|
405 | 407 | test-pathconflicts-merge.t |
|
406 | 408 | test-pathconflicts-update.t |
|
407 | 409 | test-pathencode.py |
|
408 | 410 | test-pending.t |
|
409 | 411 | test-permissions.t |
|
410 | 412 | test-phases-exchange.t |
|
411 | 413 | test-phases.t |
|
412 | 414 | test-progress.t |
|
413 | 415 | test-pull-branch.t |
|
414 | 416 | test-pull-http.t |
|
415 | 417 | test-pull-permission.t |
|
416 | 418 | test-pull-pull-corruption.t |
|
417 | 419 | test-pull-r.t |
|
418 | 420 | test-pull-update.t |
|
419 | 421 | test-pull.t |
|
420 | 422 | test-purge.t |
|
421 | 423 | test-push-cgi.t |
|
422 | 424 | test-push-checkheads-partial-C1.t |
|
423 | 425 | test-push-checkheads-partial-C2.t |
|
424 | 426 | test-push-checkheads-partial-C3.t |
|
425 | 427 | test-push-checkheads-partial-C4.t |
|
426 | 428 | test-push-checkheads-pruned-B1.t |
|
427 | 429 | test-push-checkheads-pruned-B2.t |
|
428 | 430 | test-push-checkheads-pruned-B3.t |
|
429 | 431 | test-push-checkheads-pruned-B4.t |
|
430 | 432 | test-push-checkheads-pruned-B5.t |
|
431 | 433 | test-push-checkheads-pruned-B6.t |
|
432 | 434 | test-push-checkheads-pruned-B7.t |
|
433 | 435 | test-push-checkheads-pruned-B8.t |
|
434 | 436 | test-push-checkheads-superceed-A1.t |
|
435 | 437 | test-push-checkheads-superceed-A2.t |
|
436 | 438 | test-push-checkheads-superceed-A3.t |
|
437 | 439 | test-push-checkheads-superceed-A4.t |
|
438 | 440 | test-push-checkheads-superceed-A5.t |
|
439 | 441 | test-push-checkheads-superceed-A6.t |
|
440 | 442 | test-push-checkheads-superceed-A7.t |
|
441 | 443 | test-push-checkheads-superceed-A8.t |
|
442 | 444 | test-push-checkheads-unpushed-D1.t |
|
443 | 445 | test-push-checkheads-unpushed-D2.t |
|
444 | 446 | test-push-checkheads-unpushed-D3.t |
|
445 | 447 | test-push-checkheads-unpushed-D4.t |
|
446 | 448 | test-push-checkheads-unpushed-D5.t |
|
447 | 449 | test-push-checkheads-unpushed-D6.t |
|
448 | 450 | test-push-checkheads-unpushed-D7.t |
|
449 | 451 | test-push-http.t |
|
450 | 452 | test-push-warn.t |
|
451 | 453 | test-push.t |
|
452 | 454 | test-pushvars.t |
|
453 | 455 | test-qrecord.t |
|
454 | 456 | test-rebase-abort.t |
|
455 | 457 | test-rebase-backup.t |
|
456 | 458 | test-rebase-base-flag.t |
|
457 | 459 | test-rebase-bookmarks.t |
|
458 | 460 | test-rebase-brute-force.t |
|
459 | 461 | test-rebase-cache.t |
|
460 | 462 | test-rebase-check-restore.t |
|
461 | 463 | test-rebase-collapse.t |
|
462 | 464 | test-rebase-conflicts.t |
|
463 | 465 | test-rebase-dest.t |
|
464 | 466 | test-rebase-detach.t |
|
465 | 467 | test-rebase-emptycommit.t |
|
466 | 468 | test-rebase-inmemory.t |
|
467 | 469 | test-rebase-interruptions.t |
|
468 | 470 | test-rebase-issue-noparam-single-rev.t |
|
469 | 471 | test-rebase-legacy.t |
|
470 | 472 | test-rebase-mq-skip.t |
|
471 | 473 | test-rebase-mq.t |
|
472 | 474 | test-rebase-named-branches.t |
|
473 | 475 | test-rebase-newancestor.t |
|
474 | 476 | test-rebase-obsolete.t |
|
475 | 477 | test-rebase-parameters.t |
|
476 | 478 | test-rebase-partial.t |
|
477 | 479 | test-rebase-pull.t |
|
478 | 480 | test-rebase-rename.t |
|
479 | 481 | test-rebase-scenario-global.t |
|
480 | 482 | test-rebase-templates.t |
|
481 | 483 | test-rebase-transaction.t |
|
482 | 484 | test-rebuildstate.t |
|
483 | 485 | test-record.t |
|
484 | 486 | test-relink.t |
|
485 | 487 | test-remove.t |
|
486 | 488 | test-removeemptydirs.t |
|
487 | 489 | test-rename-after-merge.t |
|
488 | 490 | test-rename-dir-merge.t |
|
489 | 491 | test-rename-merge1.t |
|
490 | 492 | test-rename-merge2.t |
|
491 | 493 | test-rename.t |
|
492 | 494 | test-repair-strip.t |
|
493 | 495 | test-repo-compengines.t |
|
494 | 496 | test-requires.t |
|
495 | 497 | test-resolve.t |
|
496 | 498 | test-revert-flags.t |
|
497 | 499 | test-revert-interactive.t |
|
498 | 500 | test-revert-unknown.t |
|
499 | 501 | test-revert.t |
|
500 | 502 | test-revisions.t |
|
501 | 503 | test-revlog-ancestry.py |
|
502 | 504 | test-revlog-group-emptyiter.t |
|
503 | 505 | test-revlog-mmapindex.t |
|
504 | 506 | test-revlog-packentry.t |
|
505 | 507 | test-revlog-raw.py |
|
506 | 508 | test-revlog-v2.t |
|
507 | 509 | test-revset-dirstate-parents.t |
|
508 | 510 | test-revset-legacy-lookup.t |
|
509 | 511 | test-revset-outgoing.t |
|
510 | 512 | test-rollback.t |
|
511 | 513 | test-run-tests.py |
|
512 | 514 | test-run-tests.t |
|
513 | 515 | test-schemes.t |
|
514 | 516 | test-serve.t |
|
515 | 517 | test-setdiscovery.t |
|
516 | 518 | test-share.t |
|
517 | 519 | test-shelve.t |
|
518 | 520 | test-show-stack.t |
|
519 | 521 | test-show-work.t |
|
520 | 522 | test-show.t |
|
521 | 523 | test-simple-update.t |
|
522 | 524 | test-simplekeyvaluefile.py |
|
523 | 525 | test-simplemerge.py |
|
524 | 526 | test-single-head.t |
|
525 | 527 | test-sparse-clear.t |
|
526 | 528 | test-sparse-clone.t |
|
527 | 529 | test-sparse-import.t |
|
528 | 530 | test-sparse-merges.t |
|
529 | 531 | test-sparse-profiles.t |
|
530 | 532 | test-sparse-requirement.t |
|
531 | 533 | test-sparse-verbose-json.t |
|
532 | 534 | test-sparse.t |
|
533 | 535 | test-split.t |
|
534 | 536 | test-ssh-bundle1.t |
|
535 | 537 | test-ssh-clone-r.t |
|
536 | 538 | test-ssh-proto-unbundle.t |
|
537 | 539 | test-ssh-proto.t |
|
538 | 540 | test-ssh-repoerror.t |
|
539 | 541 | test-ssh.t |
|
540 | 542 | test-sshserver.py |
|
541 | 543 | test-stack.t |
|
542 | 544 | test-status-color.t |
|
543 | 545 | test-status-inprocess.py |
|
544 | 546 | test-status-rev.t |
|
545 | 547 | test-status-terse.t |
|
546 | 548 | test-storage.py |
|
547 | 549 | test-stream-bundle-v2.t |
|
548 | 550 | test-strict.t |
|
549 | 551 | test-strip-cross.t |
|
550 | 552 | test-strip.t |
|
551 | 553 | test-subrepo-deep-nested-change.t |
|
552 | 554 | test-subrepo-missing.t |
|
553 | 555 | test-subrepo-paths.t |
|
554 | 556 | test-subrepo-recursion.t |
|
555 | 557 | test-subrepo-relative-path.t |
|
556 | 558 | test-subrepo.t |
|
557 | 559 | test-symlink-os-yes-fs-no.py |
|
558 | 560 | test-symlink-placeholder.t |
|
559 | 561 | test-symlinks.t |
|
560 | 562 | test-tag.t |
|
561 | 563 | test-tags.t |
|
562 | 564 | test-template-basic.t |
|
563 | 565 | test-template-functions.t |
|
564 | 566 | test-template-keywords.t |
|
565 | 567 | test-template-map.t |
|
566 | 568 | test-transplant.t |
|
567 | 569 | test-treemanifest.t |
|
568 | 570 | test-ui-color.py |
|
569 | 571 | test-ui-config.py |
|
570 | 572 | test-ui-verbosity.py |
|
571 | 573 | test-unamend.t |
|
572 | 574 | test-unbundlehash.t |
|
573 | 575 | test-uncommit.t |
|
574 | 576 | test-unified-test.t |
|
575 | 577 | test-unionrepo.t |
|
576 | 578 | test-unrelated-pull.t |
|
577 | 579 | test-up-local-change.t |
|
578 | 580 | test-update-branches.t |
|
579 | 581 | test-update-dest.t |
|
580 | 582 | test-update-issue1456.t |
|
581 | 583 | test-update-names.t |
|
582 | 584 | test-update-reverse.t |
|
583 | 585 | test-upgrade-repo.t |
|
584 | 586 | test-url-download.t |
|
585 | 587 | test-url-rev.t |
|
586 | 588 | test-url.py |
|
587 | 589 | test-username-newline.t |
|
588 | 590 | test-util.py |
|
589 | 591 | test-verify.t |
|
590 | 592 | test-walk.t |
|
591 | 593 | test-walkrepo.py |
|
592 | 594 | test-websub.t |
|
593 | 595 | test-win32text.t |
|
594 | 596 | test-wireproto-clientreactor.py |
|
595 | 597 | test-wireproto-command-branchmap.t |
|
596 | 598 | test-wireproto-command-changesetdata.t |
|
597 | 599 | test-wireproto-command-filedata.t |
|
598 | 600 | test-wireproto-command-filesdata.t |
|
599 | 601 | test-wireproto-command-heads.t |
|
600 | 602 | test-wireproto-command-listkeys.t |
|
601 | 603 | test-wireproto-command-lookup.t |
|
602 | 604 | test-wireproto-command-manifestdata.t |
|
603 | 605 | test-wireproto-command-pushkey.t |
|
604 | 606 | test-wireproto-framing.py |
|
605 | 607 | test-wireproto-serverreactor.py |
|
606 | 608 | test-wireproto.py |
|
607 | 609 | test-wsgirequest.py |
|
608 | 610 | test-xdg.t |
@@ -1,136 +1,136 b'' | |||
|
1 | 1 | Set up repo |
|
2 | 2 | |
|
3 | 3 | $ cat << EOF >> $HGRCPATH |
|
4 | 4 | > [ui] |
|
5 | 5 | > origbackuppath=.hg/origbackups |
|
6 | 6 | > [merge] |
|
7 | 7 | > checkunknown=warn |
|
8 | 8 | > EOF |
|
9 | 9 | $ hg init repo |
|
10 | 10 | $ cd repo |
|
11 | 11 | $ echo base > base |
|
12 | 12 | $ hg add base |
|
13 | 13 | $ hg commit -m "base" |
|
14 | 14 | |
|
15 | 15 | Make a dir named b that contains a file, and a file named d |
|
16 | 16 | |
|
17 | 17 | $ mkdir -p b |
|
18 | 18 | $ echo c1 > b/c |
|
19 | 19 | $ echo d1 > d |
|
20 | 20 | $ hg add b/c d |
|
21 | 21 | $ hg commit -m "c1" |
|
22 | 22 | $ hg bookmark c1 |
|
23 | 23 | |
|
24 | 24 | Peform an update that causes b/c to be backed up |
|
25 | 25 | |
|
26 | 26 | $ hg up -q 0 |
|
27 | 27 | $ mkdir -p b |
|
28 | 28 | $ echo c2 > b/c |
|
29 | 29 | $ hg up --verbose c1 |
|
30 | 30 | resolving manifests |
|
31 | 31 | b/c: replacing untracked file |
|
32 | 32 | getting b/c |
|
33 | 33 | creating directory: $TESTTMP/repo/.hg/origbackups/b |
|
34 | 34 | getting d |
|
35 | 35 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 36 | (activating bookmark c1) |
|
37 | 37 | $ test -f .hg/origbackups/b/c |
|
38 | 38 | |
|
39 | 39 | Make files named b and d |
|
40 | 40 | |
|
41 | 41 | $ hg up -q 0 |
|
42 | 42 | $ echo b1 > b |
|
43 | 43 | $ echo d2 > d |
|
44 | 44 | $ hg add b d |
|
45 | 45 | $ hg commit -m b1 |
|
46 | 46 | created new head |
|
47 | 47 | $ hg bookmark b1 |
|
48 | 48 | |
|
49 | 49 | Perform an update that causes b to be backed up - it should replace the backup b dir |
|
50 | 50 | |
|
51 | 51 | $ hg up -q 0 |
|
52 | 52 | $ echo b2 > b |
|
53 | 53 | $ hg up --verbose b1 |
|
54 | 54 | resolving manifests |
|
55 | 55 | b: replacing untracked file |
|
56 | 56 | getting b |
|
57 | 57 | removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b |
|
58 | 58 | getting d |
|
59 | 59 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 | 60 | (activating bookmark b1) |
|
61 | 61 | $ test -f .hg/origbackups/b |
|
62 | 62 | |
|
63 | 63 | Perform an update the causes b/c to be backed up again - it should replace the backup b file |
|
64 | 64 | |
|
65 | 65 | $ hg up -q 0 |
|
66 | 66 | $ mkdir b |
|
67 | 67 | $ echo c3 > b/c |
|
68 | 68 | $ hg up --verbose c1 |
|
69 | 69 | resolving manifests |
|
70 | 70 | b/c: replacing untracked file |
|
71 | 71 | getting b/c |
|
72 | 72 | creating directory: $TESTTMP/repo/.hg/origbackups/b |
|
73 | 73 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b |
|
74 | 74 | getting d |
|
75 | 75 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
76 | 76 | (activating bookmark c1) |
|
77 | 77 | $ test -d .hg/origbackups/b |
|
78 | 78 | |
|
79 | 79 | Cause two symlinks to be backed up that points to a valid location from the backup dir |
|
80 | 80 | |
|
81 | 81 | $ hg up -q 0 |
|
82 | 82 | $ mkdir ../sym-link-target |
|
83 | 83 | #if symlink |
|
84 | 84 | $ ln -s ../../../sym-link-target b |
|
85 | 85 | $ ln -s ../../../sym-link-target d |
|
86 | 86 | #else |
|
87 | 87 | $ touch b d |
|
88 | 88 | #endif |
|
89 | 89 | $ hg up b1 |
|
90 | 90 | b: replacing untracked file |
|
91 | 91 | d: replacing untracked file |
|
92 | 92 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 | 93 | (activating bookmark b1) |
|
94 | 94 | #if symlink |
|
95 | 95 | $ readlink.py .hg/origbackups/b |
|
96 | 96 | .hg/origbackups/b -> ../../../sym-link-target |
|
97 | 97 | #endif |
|
98 | 98 | |
|
99 | 99 | Perform an update that causes b/c and d to be backed up again - b/c should not go into the target dir |
|
100 | 100 | |
|
101 | 101 | $ hg up -q 0 |
|
102 | 102 | $ mkdir b |
|
103 | 103 | $ echo c4 > b/c |
|
104 | 104 | $ echo d3 > d |
|
105 | 105 | $ hg up --verbose c1 |
|
106 | 106 | resolving manifests |
|
107 | 107 | b/c: replacing untracked file |
|
108 | 108 | d: replacing untracked file |
|
109 | 109 | getting b/c |
|
110 | 110 | creating directory: $TESTTMP/repo/.hg/origbackups/b |
|
111 | 111 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b |
|
112 | 112 | getting d |
|
113 | 113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
114 | 114 | (activating bookmark c1) |
|
115 | 115 | $ cat .hg/origbackups/b/c |
|
116 | 116 | c4 |
|
117 | 117 | $ cat .hg/origbackups/d |
|
118 | 118 | d3 |
|
119 | 119 | $ ls ../sym-link-target |
|
120 | 120 | |
|
121 | 121 | Incorrectly configure origbackuppath to be under a file |
|
122 | 122 | |
|
123 | 123 | $ echo data > .hg/badorigbackups |
|
124 | 124 | $ hg up -q 0 |
|
125 | 125 | $ mkdir b |
|
126 | 126 | $ echo c5 > b/c |
|
127 | 127 | $ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups |
|
128 | 128 | resolving manifests |
|
129 | 129 | b/c: replacing untracked file |
|
130 | 130 | getting b/c |
|
131 | 131 | creating directory: $TESTTMP/repo/.hg/badorigbackups/b |
|
132 |
abort: $ENOTDIR$: |
|
|
132 | abort: $ENOTDIR$: *$TESTTMP/repo/.hg/badorigbackups/b* (glob) | |
|
133 | 133 | [255] |
|
134 | 134 | $ cat .hg/badorigbackups |
|
135 | 135 | data |
|
136 | 136 |
@@ -1,106 +1,106 b'' | |||
|
1 | 1 | Path conflict checking is currently disabled by default because of issue5716. |
|
2 | 2 | Turn it on for this test. |
|
3 | 3 | |
|
4 | 4 | $ cat >> $HGRCPATH << EOF |
|
5 | 5 | > [experimental] |
|
6 | 6 | > merge.checkpathconflicts=True |
|
7 | 7 | > EOF |
|
8 | 8 | |
|
9 | 9 | $ hg init repo |
|
10 | 10 | $ cd repo |
|
11 | 11 | $ echo base > base |
|
12 | 12 | $ hg add base |
|
13 | 13 | $ hg commit -m "base" |
|
14 | 14 | $ hg bookmark -i base |
|
15 | 15 | $ echo 1 > a |
|
16 | 16 | $ hg add a |
|
17 | 17 | $ hg commit -m "file" |
|
18 | 18 | $ hg bookmark -i file |
|
19 | 19 | $ echo 2 > a |
|
20 | 20 | $ hg commit -m "file2" |
|
21 | 21 | $ hg bookmark -i file2 |
|
22 | 22 | $ hg up -q 0 |
|
23 | 23 | $ mkdir a |
|
24 | 24 | $ echo 2 > a/b |
|
25 | 25 | $ hg add a/b |
|
26 | 26 | $ hg commit -m "dir" |
|
27 | 27 | created new head |
|
28 | 28 | $ hg bookmark -i dir |
|
29 | 29 | |
|
30 | 30 | Basic merge - local file conflicts with remote directory |
|
31 | 31 | |
|
32 | 32 | $ hg up -q file |
|
33 | 33 | $ hg bookmark -i |
|
34 | 34 | $ hg merge --verbose dir |
|
35 | 35 | resolving manifests |
|
36 | 36 | a: path conflict - a file or link has the same name as a directory |
|
37 | 37 | the local file has been renamed to a~853701544ac3 |
|
38 | 38 | resolve manually then use 'hg resolve --mark a' |
|
39 | 39 | moving a to a~853701544ac3 |
|
40 | 40 | getting a/b |
|
41 | 41 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
42 | 42 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
43 | 43 | [1] |
|
44 | 44 | $ hg update --clean . |
|
45 | 45 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
46 | 46 | $ rm a~853701544ac3 |
|
47 | 47 | |
|
48 | 48 | Basic update - local directory conflicts with remote file |
|
49 | 49 | |
|
50 | 50 | $ hg up -q 0 |
|
51 | 51 | $ mkdir a |
|
52 | 52 | $ echo 3 > a/b |
|
53 | 53 | $ hg up file |
|
54 | 54 | a: untracked directory conflicts with file |
|
55 | 55 | abort: untracked files in working directory differ from files in requested revision |
|
56 | 56 | [255] |
|
57 | 57 | $ hg up --clean file |
|
58 | 58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
59 | 59 | (activating bookmark file) |
|
60 | 60 | |
|
61 | 61 | Repo state is ok |
|
62 | 62 | |
|
63 | 63 | $ hg sum |
|
64 | 64 | parent: 1:853701544ac3 |
|
65 | 65 | file |
|
66 | 66 | branch: default |
|
67 | 67 | bookmarks: *file |
|
68 | 68 | commit: (clean) |
|
69 | 69 | update: 2 new changesets (update) |
|
70 | 70 | phases: 4 draft |
|
71 | 71 | |
|
72 | 72 | Basic update - untracked file conflicts with remote directory |
|
73 | 73 | |
|
74 | 74 | $ hg up -q 0 |
|
75 | 75 | $ echo untracked > a |
|
76 | 76 | $ hg up --config merge.checkunknown=warn dir |
|
77 | 77 | a: replacing untracked file |
|
78 | 78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
79 | 79 | (activating bookmark dir) |
|
80 | 80 | $ cat a.orig |
|
81 | 81 | untracked |
|
82 | 82 | $ rm -f a.orig |
|
83 | 83 | |
|
84 | 84 | Basic clean update - local directory conflicts with changed remote file |
|
85 | 85 | |
|
86 | 86 | $ hg up -q file |
|
87 | 87 | $ rm a |
|
88 | 88 | $ mkdir a |
|
89 | 89 | $ echo 4 > a/b |
|
90 | 90 | $ hg up file2 |
|
91 |
abort: *: |
|
|
91 | abort: *: *$TESTTMP/repo/a* (glob) | |
|
92 | 92 | [255] |
|
93 | 93 | $ hg up --clean file2 |
|
94 | 94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 | 95 | (activating bookmark file2) |
|
96 | 96 | |
|
97 | 97 | Repo state is ok |
|
98 | 98 | |
|
99 | 99 | $ hg sum |
|
100 | 100 | parent: 2:f64e09fac717 |
|
101 | 101 | file2 |
|
102 | 102 | branch: default |
|
103 | 103 | bookmarks: *file2 |
|
104 | 104 | commit: (clean) |
|
105 | 105 | update: 1 new changesets, 2 branch heads (merge) |
|
106 | 106 | phases: 4 draft |
General Comments 0
You need to be logged in to leave comments.
Login now