##// END OF EJS Templates
revert: restore the ability to revert across case only renames (issue4481)...
Matt Harbison -
r24857:d8505bfe stable
parent child Browse files
Show More
@@ -3084,7 +3084,10 b' def _performrevert(repo, parents, ctx, a'
3084 repo.dirstate.drop(f)
3084 repo.dirstate.drop(f)
3085 for f in actions['remove'][0]:
3085 for f in actions['remove'][0]:
3086 audit_path(f)
3086 audit_path(f)
3087 try:
3087 util.unlinkpath(repo.wjoin(f))
3088 util.unlinkpath(repo.wjoin(f))
3089 except OSError:
3090 pass
3088 repo.dirstate.remove(f)
3091 repo.dirstate.remove(f)
3089 for f in actions['drop'][0]:
3092 for f in actions['drop'][0]:
3090 audit_path(f)
3093 audit_path(f)
@@ -153,6 +153,23 b' issue 3342: file in nested directory cau'
153 $ mkdir -p a/B/c/D
153 $ mkdir -p a/B/c/D
154 $ echo e > a/B/c/D/e
154 $ echo e > a/B/c/D/e
155 $ hg add a/B/c/D/e
155 $ hg add a/B/c/D/e
156 $ hg ci -m 'add e'
157
158 issue 4481: revert across case only renames
159 $ hg mv a/B/c/D/e a/B/c/d/E
160 $ hg ci -m "uppercase E"
161 $ echo 'foo' > a/B/c/D/E
162 $ hg ci -m 'e content change'
163 $ hg revert --all -r 0
164 removing a\B\c\D\E
165 adding a\B\c\D\e
166 $ find * | sort
167 a
168 a/B
169 a/B/c
170 a/B/c/D
171 a/B/c/D/e
172 a/B/c/D/e.orig
156
173
157 $ cd ..
174 $ cd ..
158
175
General Comments 0
You need to be logged in to leave comments. Login now