##// END OF EJS Templates
dirstate: fix some problems for recursive case normalization (issue3342)...
FUJIWARA Katsunori -
r16323:0789d1bb stable
parent child Browse files
Show More
@@ -406,9 +406,10 b' class dirstate(object):'
406 # recursively normalize leading directory components
406 # recursively normalize leading directory components
407 # against dirstate
407 # against dirstate
408 if '/' in normed:
408 if '/' in normed:
409 d, f = normed.rsplit('/')
409 d, f = normed.rsplit('/', 1)
410 d = self._root + "/" + self._normalize(d, isknown)
410 d = self._normalize(d, isknown)
411 folded = d + "/" + util.fspath(f, d)
411 r = self._root + "/" + d
412 folded = d + "/" + util.fspath(f, r)
412 else:
413 else:
413 folded = util.fspath(normed, self._root)
414 folded = util.fspath(normed, self._root)
414 self._foldmap[normed] = folded
415 self._foldmap[normed] = folded
@@ -73,6 +73,17 b' no clobbering of untracked files with wr'
73
73
74 $ cd ..
74 $ cd ..
75
75
76 issue 3342: file in nested directory causes unexpected abort
77
78 $ hg init issue3342
79 $ cd issue3342
80
81 $ mkdir -p a/B/c/D
82 $ echo e > a/B/c/D/e
83 $ hg add a/B/c/D/e
84
85 $ cd ..
86
76 issue 3340: mq does not handle case changes correctly
87 issue 3340: mq does not handle case changes correctly
77
88
78 in addition to reported case, 'hg qrefresh' is also tested against
89 in addition to reported case, 'hg qrefresh' is also tested against
General Comments 0
You need to be logged in to leave comments. Login now