##// END OF EJS Templates
largefiles: missing largefiles should not be committed as removed...
Mads Kiilerich -
r18726:431b246c stable
parent child Browse files
Show More
@@ -299,9 +299,9 b' def reposetup(ui, repo):'
299 lfdirstate = lfutil.openlfdirstate(ui, self)
299 lfdirstate = lfutil.openlfdirstate(ui, self)
300 dirtymatch = match_.always(self.root, self.getcwd())
300 dirtymatch = match_.always(self.root, self.getcwd())
301 s = lfdirstate.status(dirtymatch, [], False, False, False)
301 s = lfdirstate.status(dirtymatch, [], False, False, False)
302 modifiedfiles = []
302 (unsure, modified, added, removed, _missing, _unknown,
303 for i in s:
303 _ignored, _clean) = s
304 modifiedfiles.extend(i)
304 modifiedfiles = unsure + modified + added + removed
305 lfiles = lfutil.listlfiles(self)
305 lfiles = lfutil.listlfiles(self)
306 # this only loops through largefiles that exist (not
306 # this only loops through largefiles that exist (not
307 # removed/renamed)
307 # removed/renamed)
@@ -1261,6 +1261,42 b' revert some files to an older revision'
1261
1261
1262 - cleanup
1262 - cleanup
1263 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1263 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1264 $ rm -f .hglf/sub/*.orig
1265
1266 Update to revision with missing largefile - and make sure it really is missing
1267
1268 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
1269 $ hg up -r 6
1270 getting changed largefiles
1271 error getting id 7838695e10da2bb75ac1156565f40a2595fa2fa0 from url file:$TESTTMP/d for file large3: can't get file locally (glob)
1272 1 largefiles updated, 2 removed
1273 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
1274 $ rm normal3
1275 $ echo >> sub/normal4
1276 $ hg ci -m 'commit with missing files'
1277 Invoking status precommit hook
1278 M sub/normal4
1279 ! large3
1280 ! normal3
1281 created new head
1282 $ hg st
1283 ! large3
1284 ! normal3
1285 $ hg up -r.
1286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1287 $ hg st
1288 ! large3
1289 ! normal3
1290 $ hg up -Cr.
1291 getting changed largefiles
1292 error getting id 7838695e10da2bb75ac1156565f40a2595fa2fa0 from url file:$TESTTMP/d for file large3: can't get file locally (glob)
1293 0 largefiles updated, 0 removed
1294 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1295 $ hg st
1296 ! large3
1297 $ hg rollback
1298 repository tip rolled back to revision 9 (undo commit)
1299 working directory now based on revision 6
1264
1300
1265 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1301 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1266
1302
General Comments 0
You need to be logged in to leave comments. Login now