Show More
@@ -735,10 +735,11 b' def overridepull(orig, ui, repo, source=' | |||
|
735 | 735 | # will run into a problem later if we try to merge or rebase with one of |
|
736 | 736 | # these heads, so cache the largefiles now directly into the system |
|
737 | 737 | # cache. |
|
738 | ui.status(_("caching new largefiles\n")) | |
|
739 | 738 | numcached = 0 |
|
740 | 739 | heads = lfutil.getcurrentheads(repo) |
|
741 | 740 | newheads = set(heads).difference(set(oldheads)) |
|
741 | if len(newheads) > 0: | |
|
742 | ui.status(_("caching largefiles for %s heads\n" % len(newheads))) | |
|
742 | 743 | for head in newheads: |
|
743 | 744 | (cached, missing) = lfcommands.cachelfiles(ui, repo, head) |
|
744 | 745 | numcached += len(cached) |
@@ -883,7 +883,7 b" downloaded from 'default' instead of 'de" | |||
|
883 | 883 | adding file changes |
|
884 | 884 | added 6 changesets with 16 changes to 8 files |
|
885 | 885 | (run 'hg update' to get a working copy) |
|
886 |
caching |
|
|
886 | caching largefiles for 1 heads | |
|
887 | 887 | 3 largefiles cached |
|
888 | 888 | 3 additional largefiles cached |
|
889 | 889 | $ cd .. |
@@ -974,7 +974,7 b" The error messages go away if repo 'b' i" | |||
|
974 | 974 | adding file changes |
|
975 | 975 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
976 | 976 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
977 |
caching |
|
|
977 | caching largefiles for 1 heads | |
|
978 | 978 | 0 largefiles cached |
|
979 | 979 | $ hg rebase |
|
980 | 980 | Invoking status precommit hook |
@@ -1273,7 +1273,7 b' correctly.' | |||
|
1273 | 1273 | adding file changes |
|
1274 | 1274 | added 2 changesets with 4 changes to 4 files (+1 heads) |
|
1275 | 1275 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1276 |
caching |
|
|
1276 | caching largefiles for 1 heads | |
|
1277 | 1277 | 2 largefiles cached |
|
1278 | 1278 | $ hg merge |
|
1279 | 1279 | merging sub/large4 |
General Comments 0
You need to be logged in to leave comments.
Login now