equal
deleted
inserted
replaced
1389 $ echo "large4-merge-test" > sub/large4 |
1389 $ echo "large4-merge-test" > sub/large4 |
1390 $ hg commit -m "Modify large4 to test merge" |
1390 $ hg commit -m "Modify large4 to test merge" |
1391 Invoking status precommit hook |
1391 Invoking status precommit hook |
1392 M sub/large4 |
1392 M sub/large4 |
1393 # Test --cache-largefiles flag |
1393 # Test --cache-largefiles flag |
1394 $ hg pull --cache-largefiles ../e |
1394 $ hg pull --lfrev 'heads(pulled())' ../e |
1395 pulling from ../e |
1395 pulling from ../e |
1396 searching for changes |
1396 searching for changes |
1397 adding changesets |
1397 adding changesets |
1398 adding manifests |
1398 adding manifests |
1399 adding file changes |
1399 adding file changes |
1400 added 2 changesets with 4 changes to 4 files (+1 heads) |
1400 added 2 changesets with 4 changes to 4 files (+1 heads) |
1401 (run 'hg heads' to see heads, 'hg merge' to merge) |
1401 (run 'hg heads' to see heads, 'hg merge' to merge) |
1402 caching largefiles for 1 heads |
|
1403 2 largefiles cached |
1402 2 largefiles cached |
1404 $ hg merge |
1403 $ hg merge |
1405 merging sub/large4 |
1404 merging sub/large4 |
1406 largefile sub/large4 has a merge conflict |
1405 largefile sub/large4 has a merge conflict |
1407 keep (l)ocal or take (o)ther? l |
1406 keep (l)ocal or take (o)ther? l |