Comments
Patch
@@ -173,8 +173,11 @@
s = lfdirstate.status(match, [], False, False, False)
unsure, modified, added, removed, missing, unknown, ignored, clean = s
for lfile in unsure:
- if repo[rev][standin(lfile)].data().strip() != \
- hashfile(repo.wjoin(lfile)):
+ try:
+ fctx = repo[rev][standin(lfile)]
+ except LookupError:
+ fctx = None
+ if not fctx or fctx.data().strip() != hashfile(repo.wjoin(lfile)):
modified.append(lfile)
else:
clean.append(lfile)
@@ -1208,6 +1208,10 @@
$ hg status
M large
+- revert should be able to revert files introduced in a pending merge
+ $ hg revert --all -r .
+ removing .hglf/large
+
Test that a normal file and a largefile with the same name and path cannot
coexist.