##// END OF EJS Templates
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard -
r15900:29defa7d stable
parent child Browse files
Show More
@@ -451,7 +451,7 b' def _updatelfile(repo, lfdirstate, lfile'
451 # largefile is converted back to a normal file: the standin
451 # largefile is converted back to a normal file: the standin
452 # disappears, but a new (normal) file appears as the lfile.
452 # disappears, but a new (normal) file appears as the lfile.
453 if os.path.exists(abslfile) and lfile not in repo[None]:
453 if os.path.exists(abslfile) and lfile not in repo[None]:
454 os.unlink(abslfile)
454 util.unlinkpath(abslfile)
455 ret = -1
455 ret = -1
456 state = repo.dirstate[lfutil.standin(lfile)]
456 state = repo.dirstate[lfutil.standin(lfile)]
457 if state == 'n':
457 if state == 'n':
@@ -571,6 +571,14 b' Now "update check" is happy.'
571 getting changed largefiles
571 getting changed largefiles
572 1 largefiles updated, 0 removed
572 1 largefiles updated, 0 removed
573
573
574 Test removing empty largefiles directories on update
575 $ test -d sub2 && echo "sub2 exists"
576 sub2 exists
577 $ hg update -q null
578 $ test -d sub2 && echo "error: sub2 should not exist anymore"
579 [1]
580 $ hg update -q
581
574 "revert" works on largefiles (and normal files too).
582 "revert" works on largefiles (and normal files too).
575 $ echo hack3 >> normal3
583 $ echo hack3 >> normal3
576 $ echo hack4 >> sub/normal4
584 $ echo hack4 >> sub/normal4
General Comments 0
You need to be logged in to leave comments. Login now