Show More
@@ -502,7 +502,8 b' def _updatelfile(repo, lfdirstate, lfile' | |||||
502 | # lfile is added to the repository again. This happens when a |
|
502 | # lfile is added to the repository again. This happens when a | |
503 | # largefile is converted back to a normal file: the standin |
|
503 | # largefile is converted back to a normal file: the standin | |
504 | # disappears, but a new (normal) file appears as the lfile. |
|
504 | # disappears, but a new (normal) file appears as the lfile. | |
505 |
if os.path.exists(abslfile) and |
|
505 | if (os.path.exists(abslfile) and | |
|
506 | repo.dirstate.normalize(lfile) not in repo[None]): | |||
506 | util.unlinkpath(abslfile) |
|
507 | util.unlinkpath(abslfile) | |
507 | ret = -1 |
|
508 | ret = -1 | |
508 | state = repo.dirstate[lfutil.standin(lfile)] |
|
509 | state = repo.dirstate[lfutil.standin(lfile)] |
@@ -106,6 +106,28 b' no clobbering of untracked files with wr' | |||||
106 | [255] |
|
106 | [255] | |
107 | $ cat a |
|
107 | $ cat a | |
108 | gold |
|
108 | gold | |
|
109 | $ rm a | |||
|
110 | ||||
|
111 | test that normal file in different case on target context is not | |||
|
112 | unlinked by largefiles extension. | |||
|
113 | ||||
|
114 | $ cat >> .hg/hgrc <<EOF | |||
|
115 | > [extensions] | |||
|
116 | > largefiles= | |||
|
117 | > EOF | |||
|
118 | $ hg update -q -C 1 | |||
|
119 | $ hg status -A | |||
|
120 | $ echo 'A as largefiles' > A | |||
|
121 | $ hg add --large A | |||
|
122 | $ hg commit -m '#3' | |||
|
123 | created new head | |||
|
124 | $ hg manifest -r 3 | |||
|
125 | .hglf/A | |||
|
126 | $ hg manifest -r 0 | |||
|
127 | a | |||
|
128 | $ hg update -q -C 0 | |||
|
129 | $ hg status -A | |||
|
130 | C a | |||
109 |
|
131 | |||
110 | $ cd .. |
|
132 | $ cd .. | |
111 |
|
133 |
General Comments 0
You need to be logged in to leave comments.
Login now