##// END OF EJS Templates
fix: allow fixing untracked files when given as arguments...
Danny Hooper -
r42175:7f6b375a default
parent child Browse files
Show More
@@ -282,8 +282,6 b' def getworkqueue(ui, repo, pats, opts, r'
282 match = scmutil.match(fixctx, pats, opts)
282 match = scmutil.match(fixctx, pats, opts)
283 for path in pathstofix(ui, repo, pats, opts, match, basectxs[rev],
283 for path in pathstofix(ui, repo, pats, opts, match, basectxs[rev],
284 fixctx):
284 fixctx):
285 if path not in fixctx:
286 continue
287 fctx = fixctx[path]
285 fctx = fixctx[path]
288 if fctx.islink():
286 if fctx.islink():
289 continue
287 continue
@@ -354,6 +354,10 b' and without providing explicit file argu'
354
354
355 $ printf "modified!!!\n" > modified.whole
355 $ printf "modified!!!\n" > modified.whole
356 $ printf "added\n" > added.whole
356 $ printf "added\n" > added.whole
357
358 Listing the files explicitly causes untracked files to also be fixed, but
359 ignored files are still unaffected.
360
357 $ hg fix --working-dir *.whole
361 $ hg fix --working-dir *.whole
358
362
359 $ hg status --all
363 $ hg status --all
@@ -366,13 +370,12 b' and without providing explicit file argu'
366 I ignored.whole
370 I ignored.whole
367 C .hgignore
371 C .hgignore
368
372
369 It would be better if this also fixed the unknown file.
370 $ cat *.whole
373 $ cat *.whole
371 ADDED
374 ADDED
372 CLEAN
375 CLEAN
373 ignored
376 ignored
374 MODIFIED!!!
377 MODIFIED!!!
375 unknown
378 UNKNOWN
376
379
377 $ cd ..
380 $ cd ..
378
381
General Comments 0
You need to be logged in to leave comments. Login now