comparison tests/test-largefiles.t @ 18729:4e53ac3f466a stable

largefiles: updatelfiles should use working dir standins, not standins from p1 This makes a difference when working directory is dirty, especially when merging with a revision for which we don't have largefiles.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 28 Feb 2013 13:45:18 +0100
parents 431b246cfb12
children c2d079387b2c
comparison
equal deleted inserted replaced
18728:1e636f7b1cfe 18729:4e53ac3f466a
1296 ! large3 1296 ! large3
1297 $ hg rollback 1297 $ hg rollback
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
1304 pulling from $TESTTMP/d (glob) 1323 pulling from $TESTTMP/d (glob)
1305 searching for changes 1324 searching for changes