##// END OF EJS Templates
largefiles: ensure addlargefiles() doesn't add a standin as a largefile...
Matt Harbison -
r17232:25248e2e stable
parent child Browse files
Show More
@@ -81,7 +81,7 b' def addlargefiles(ui, repo, *pats, **opt'
81 ui.warn(_('%s already a largefile\n') % f)
81 ui.warn(_('%s already a largefile\n') % f)
82 continue
82 continue
83
83
84 if exact or not exists:
84 if (exact or not exists) and not lfutil.isstandin(f):
85 wfile = repo.wjoin(f)
85 wfile = repo.wjoin(f)
86
86
87 # In case the file was removed previously, but not committed
87 # In case the file was removed previously, but not committed
@@ -383,7 +383,6 b' Test addremove with -R'
383 $ cd ..
383 $ cd ..
384 $ hg -R a addremove
384 $ hg -R a addremove
385 removing sub/large4
385 removing sub/large4
386 adding a/.hglf/testaddremove.dat as a largefile (glob)
387 adding a/testaddremove.dat as a largefile (glob)
386 adding a/testaddremove.dat as a largefile (glob)
388 removing normal3
387 removing normal3
389 adding normaladdremove
388 adding normaladdremove
@@ -489,6 +488,26 b' Test 3507 (both normal files and largefi'
489 C sub2/large6
488 C sub2/large6
490 C sub2/large7
489 C sub2/large7
491
490
491 Test that a standin can't be added as a large file
492
493 $ touch large
494 $ hg add --large large
495 $ hg ci -m "add"
496 Invoking status precommit hook
497 A large
498 Invoking status postcommit hook
499 C large
500 C normal
501 C normal3
502 C sub/large4
503 C sub/normal4
504 C sub2/large6
505 C sub2/large7
506 $ hg remove large
507 $ touch large
508 $ hg addremove --config largefiles.patterns=**large --traceback
509 adding large as a largefile
510
492 $ cd ../a
511 $ cd ../a
493
512
494 Clone a largefiles repo.
513 Clone a largefiles repo.
General Comments 0
You need to be logged in to leave comments. Login now