##// END OF EJS Templates
largefiles: updatelfiles should use working dir standins, not standins from p1...
Mads Kiilerich -
r18729:4e53ac3f stable
parent child Browse files
Show More
@@ -450,7 +450,7 b' def updatelfiles(ui, repo, filelist=None'
450 if printmessage and lfiles:
450 if printmessage and lfiles:
451 ui.status(_('getting changed largefiles\n'))
451 ui.status(_('getting changed largefiles\n'))
452 printed = True
452 printed = True
453 cachelfiles(ui, repo, '.', lfiles)
453 cachelfiles(ui, repo, None, lfiles)
454
454
455 updated, removed = 0, 0
455 updated, removed = 0, 0
456 for f in lfiles:
456 for f in lfiles:
@@ -1298,6 +1298,25 b' Update to revision with missing largefil'
1298 repository tip rolled back to revision 9 (undo commit)
1298 repository tip rolled back to revision 9 (undo commit)
1299 working directory now based on revision 6
1299 working directory now based on revision 6
1300
1300
1301 Merge with revision with missing largefile - and make sure it tries to fetch it.
1302
1303 $ hg up -Cqr null
1304 $ echo f > f
1305 $ hg ci -Am branch
1306 adding f
1307 Invoking status precommit hook
1308 A f
1309 created new head
1310 $ hg merge -r 6
1311 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1312 (branch merge, don't forget to commit)
1313 getting changed largefiles
1314 error getting id 7838695e10da2bb75ac1156565f40a2595fa2fa0 from url file:$TESTTMP/d for file large3: can't get file locally (glob)
1315 1 largefiles updated, 0 removed
1316
1317 $ hg rollback -q
1318 $ hg up -Cq
1319
1301 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1320 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1302
1321
1303 $ hg pull --all-largefiles
1322 $ hg pull --all-largefiles
General Comments 0
You need to be logged in to leave comments. Login now