Show More
@@ -490,8 +490,8 b' def _updatelfile(repo, lfdirstate, lfile' | |||||
490 | abslfile = repo.wjoin(lfile) |
|
490 | abslfile = repo.wjoin(lfile) | |
491 | absstandin = repo.wjoin(lfutil.standin(lfile)) |
|
491 | absstandin = repo.wjoin(lfutil.standin(lfile)) | |
492 | if os.path.exists(absstandin): |
|
492 | if os.path.exists(absstandin): | |
493 | if os.path.exists(absstandin+'.orig'): |
|
493 | if os.path.exists(absstandin + '.orig') and os.path.exists(abslfile): | |
494 | shutil.copyfile(abslfile, abslfile+'.orig') |
|
494 | shutil.copyfile(abslfile, abslfile + '.orig') | |
495 | expecthash = lfutil.readstandin(repo, lfile) |
|
495 | expecthash = lfutil.readstandin(repo, lfile) | |
496 | if (expecthash != '' and |
|
496 | if (expecthash != '' and | |
497 | (not os.path.exists(abslfile) or |
|
497 | (not os.path.exists(abslfile) or |
@@ -1017,12 +1017,16 b' Rollback on largefiles.' | |||||
1017 | abort: uncommitted local changes |
|
1017 | abort: uncommitted local changes | |
1018 | [255] |
|
1018 | [255] | |
1019 |
|
1019 | |||
1020 |
"update --clean" leaves correct largefiles in working copy |
|
1020 | "update --clean" leaves correct largefiles in working copy, even when there is | |
|
1021 | .orig files from revert in .hglf. | |||
1021 |
|
1022 | |||
|
1023 | $ echo mistake > sub2/large7 | |||
|
1024 | $ hg revert sub2/large7 | |||
|
1025 | $ hg -q update --clean -r null | |||
1022 | $ hg update --clean |
|
1026 | $ hg update --clean | |
1023 |
|
|
1027 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1024 | getting changed largefiles |
|
1028 | getting changed largefiles | |
1025 |
|
|
1029 | 3 largefiles updated, 0 removed | |
1026 | $ cat normal3 |
|
1030 | $ cat normal3 | |
1027 | normal3-modified |
|
1031 | normal3-modified | |
1028 | $ cat sub/normal4 |
|
1032 | $ cat sub/normal4 | |
@@ -1033,6 +1037,20 b' Rollback on largefiles.' | |||||
1033 | large6-modified |
|
1037 | large6-modified | |
1034 | $ cat sub2/large7 |
|
1038 | $ cat sub2/large7 | |
1035 | large7 |
|
1039 | large7 | |
|
1040 | $ cat sub2/large7.orig | |||
|
1041 | mistake | |||
|
1042 | $ cat .hglf/sub2/large7.orig | |||
|
1043 | 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31 | |||
|
1044 | ||||
|
1045 | demonstrate misfeature: .orig file is overwritten on every update -C, | |||
|
1046 | also when clean: | |||
|
1047 | $ hg update --clean | |||
|
1048 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
1049 | getting changed largefiles | |||
|
1050 | 0 largefiles updated, 0 removed | |||
|
1051 | $ cat sub2/large7.orig | |||
|
1052 | large7 | |||
|
1053 | $ rm sub2/large7.orig .hglf/sub2/large7.orig | |||
1036 |
|
1054 | |||
1037 | Now "update check" is happy. |
|
1055 | Now "update check" is happy. | |
1038 | $ hg update --check 8 |
|
1056 | $ hg update --check 8 |
General Comments 0
You need to be logged in to leave comments.
Login now