##// END OF EJS Templates
largefiles: fix addremove with -R option...
Matt Harbison -
r17229:a6d9b2d3 stable
parent child Browse files
Show More
@@ -1001,8 +1001,9 b' def overrideaddremove(orig, ui, repo, *p'
1001 # we don't remove the standin in the largefiles code, preventing a very
1001 # we don't remove the standin in the largefiles code, preventing a very
1002 # confused state later.
1002 # confused state later.
1003 if missing:
1003 if missing:
1004 m = [repo.wjoin(f) for f in missing]
1004 repo._isaddremove = True
1005 repo._isaddremove = True
1005 removelargefiles(ui, repo, *missing, **opts)
1006 removelargefiles(ui, repo, *m, **opts)
1006 repo._isaddremove = False
1007 repo._isaddremove = False
1007 # Call into the normal add code, and any files that *should* be added as
1008 # Call into the normal add code, and any files that *should* be added as
1008 # largefiles will be
1009 # largefiles will be
@@ -370,6 +370,25 b' accident.'
370 removing normal3
370 removing normal3
371 adding normaladdremove
371 adding normaladdremove
372
372
373 Test addremove with -R
374
375 $ hg up -C
376 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
377 getting changed largefiles
378 1 largefiles updated, 0 removed
379 $ rm normal3
380 $ rm sub/large4
381 $ echo "testing addremove with patterns" > testaddremove.dat
382 $ echo "normaladdremove" > normaladdremove
383 $ cd ..
384 $ hg -R a addremove
385 removing sub/large4
386 adding a/.hglf/testaddremove.dat as a largefile (glob)
387 adding a/testaddremove.dat as a largefile (glob)
388 removing normal3
389 adding normaladdremove
390 $ cd a
391
373 Clone a largefiles repo.
392 Clone a largefiles repo.
374
393
375 $ hg clone . ../b
394 $ hg clone . ../b
General Comments 0
You need to be logged in to leave comments. Login now