equal
deleted
inserted
replaced
1278 Update to revision with missing largefile - and make sure it really is missing |
1278 Update to revision with missing largefile - and make sure it really is missing |
1279 |
1279 |
1280 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 |
1280 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 |
1281 $ hg up -r 6 |
1281 $ hg up -r 6 |
1282 getting changed largefiles |
1282 getting changed largefiles |
1283 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob) |
1283 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob) |
1284 1 largefiles updated, 2 removed |
1284 1 largefiles updated, 2 removed |
1285 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1285 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1286 $ rm normal3 |
1286 $ rm normal3 |
1287 $ echo >> sub/normal4 |
1287 $ echo >> sub/normal4 |
1288 $ hg ci -m 'commit with missing files' |
1288 $ hg ci -m 'commit with missing files' |
1299 $ hg st |
1299 $ hg st |
1300 ! large3 |
1300 ! large3 |
1301 ! normal3 |
1301 ! normal3 |
1302 $ hg up -Cr. |
1302 $ hg up -Cr. |
1303 getting changed largefiles |
1303 getting changed largefiles |
1304 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob) |
1304 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob) |
1305 0 largefiles updated, 0 removed |
1305 0 largefiles updated, 0 removed |
1306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1307 $ hg st |
1307 $ hg st |
1308 ! large3 |
1308 ! large3 |
1309 $ hg rollback |
1309 $ hg rollback |
1321 created new head |
1321 created new head |
1322 $ hg merge -r 6 |
1322 $ hg merge -r 6 |
1323 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1323 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1324 (branch merge, don't forget to commit) |
1324 (branch merge, don't forget to commit) |
1325 getting changed largefiles |
1325 getting changed largefiles |
1326 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob) |
1326 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob) |
1327 1 largefiles updated, 0 removed |
1327 1 largefiles updated, 0 removed |
1328 |
1328 |
1329 $ hg rollback -q |
1329 $ hg rollback -q |
1330 $ hg up -Cq |
1330 $ hg up -Cq |
1331 |
1331 |