Mercurial > hg
comparison tests/test-largefiles.t @ 18600:8ba520003ae0
largefiles: make caching largefiles message more explicit
In some cases, caching largefiles may take a long time (if the user has
pulled a lot of new heads). This patch makes it more clear what is happening,
by showing the number of heads we are caching largefiles for.
| author | Na'Tosha Bard <natosha@unity3d.com> |
|---|---|
| date | Sat, 09 Feb 2013 15:08:21 +0000 |
| parents | 945ba91c5e16 |
| children | bcf29565d89f |
comparison
equal
deleted
inserted
replaced
| 18599:5cd1dbf4c5d2 | 18600:8ba520003ae0 |
|---|---|
| 881 adding changesets | 881 adding changesets |
| 882 adding manifests | 882 adding manifests |
| 883 adding file changes | 883 adding file changes |
| 884 added 6 changesets with 16 changes to 8 files | 884 added 6 changesets with 16 changes to 8 files |
| 885 (run 'hg update' to get a working copy) | 885 (run 'hg update' to get a working copy) |
| 886 caching new largefiles | 886 caching largefiles for 1 heads |
| 887 3 largefiles cached | 887 3 largefiles cached |
| 888 3 additional largefiles cached | 888 3 additional largefiles cached |
| 889 $ cd .. | 889 $ cd .. |
| 890 | 890 |
| 891 Rebasing between two repositories does not revert largefiles to old | 891 Rebasing between two repositories does not revert largefiles to old |
| 972 adding changesets | 972 adding changesets |
| 973 adding manifests | 973 adding manifests |
| 974 adding file changes | 974 adding file changes |
| 975 added 1 changesets with 2 changes to 2 files (+1 heads) | 975 added 1 changesets with 2 changes to 2 files (+1 heads) |
| 976 (run 'hg heads' to see heads, 'hg merge' to merge) | 976 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 977 caching new largefiles | 977 caching largefiles for 1 heads |
| 978 0 largefiles cached | 978 0 largefiles cached |
| 979 $ hg rebase | 979 $ hg rebase |
| 980 Invoking status precommit hook | 980 Invoking status precommit hook |
| 981 M sub/normal4 | 981 M sub/normal4 |
| 982 M sub2/large6 | 982 M sub2/large6 |
| 1271 adding changesets | 1271 adding changesets |
| 1272 adding manifests | 1272 adding manifests |
| 1273 adding file changes | 1273 adding file changes |
| 1274 added 2 changesets with 4 changes to 4 files (+1 heads) | 1274 added 2 changesets with 4 changes to 4 files (+1 heads) |
| 1275 (run 'hg heads' to see heads, 'hg merge' to merge) | 1275 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 1276 caching new largefiles | 1276 caching largefiles for 1 heads |
| 1277 2 largefiles cached | 1277 2 largefiles cached |
| 1278 $ hg merge | 1278 $ hg merge |
| 1279 merging sub/large4 | 1279 merging sub/large4 |
| 1280 largefile sub/large4 has a merge conflict | 1280 largefile sub/large4 has a merge conflict |
| 1281 keep (l)ocal or take (o)ther? l | 1281 keep (l)ocal or take (o)ther? l |