Show More
@@ -1075,8 +1075,8 b' def overridetransplant(orig, ui, repo, *' | |||||
1075 | return result |
|
1075 | return result | |
1076 |
|
1076 | |||
1077 | def overridecat(orig, ui, repo, file1, *pats, **opts): |
|
1077 | def overridecat(orig, ui, repo, file1, *pats, **opts): | |
1078 |
|
|
1078 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
1079 |
if not lfutil.standin(file1) in |
|
1079 | if not lfutil.standin(file1) in ctx: | |
1080 | result = orig(ui, repo, file1, *pats, **opts) |
|
1080 | result = orig(ui, repo, file1, *pats, **opts) | |
1081 | return result |
|
1081 | return result | |
1082 |
return lfcommands.catlfile(repo, file1, |
|
1082 | return lfcommands.catlfile(repo, file1, ctx.rev(), opts.get('output')) |
@@ -1032,6 +1032,10 b' Cat a largefile' | |||||
1032 | $ rm cat.out |
|
1032 | $ rm cat.out | |
1033 | $ hg cat -r a381d2c8c80e normal3 |
|
1033 | $ hg cat -r a381d2c8c80e normal3 | |
1034 | normal3-modified |
|
1034 | normal3-modified | |
|
1035 | $ hg cat -r '.^' normal3 | |||
|
1036 | normal3-modified | |||
|
1037 | $ hg cat -r '.^' sub/large4 | |||
|
1038 | large4-modified | |||
1035 |
|
1039 | |||
1036 | Test that renaming a largefile results in correct output for status |
|
1040 | Test that renaming a largefile results in correct output for status | |
1037 |
|
1041 |
General Comments 0
You need to be logged in to leave comments.
Login now