--- a/hgext/convert/common.py Wed Mar 14 16:26:14 2012 -0300
+++ b/hgext/convert/common.py Sun Mar 18 18:21:32 2012 -0500
@@ -418,6 +418,8 @@
def parsesplicemap(path):
"""Parse a splicemap, return a child/parents dictionary."""
+ if not path:
+ return {}
m = {}
try:
fp = open(path, 'r')
--- a/mercurial/dirstate.py Wed Mar 14 16:26:14 2012 -0300
+++ b/mercurial/dirstate.py Sun Mar 18 18:21:32 2012 -0500
@@ -78,10 +78,6 @@
return self._copymap
@propertycache
- def _normroot(self):
- return util.normcase(self._root)
-
- @propertycache
def _foldmap(self):
f = {}
for name in self._map:
@@ -406,7 +402,7 @@
folded = path
else:
folded = self._foldmap.setdefault(normed,
- util.fspath(normed, self._normroot))
+ util.fspath(normed, self._root))
return folded
def normalize(self, path, isknown=False):
--- a/mercurial/merge.py Wed Mar 14 16:26:14 2012 -0300
+++ b/mercurial/merge.py Sun Mar 18 18:21:32 2012 -0500
@@ -173,7 +173,7 @@
if m and m != a: # changed from a to m
return m
if n and n != a: # changed from a to n
- if (n == 'l' or a == 'l') and m1[f] != ma[f]:
+ if (n == 'l' or a == 'l') and m1.get(f) != ma.get(f):
# can't automatically merge symlink flag when there
# are file-level conflicts here, let filemerge take
# care of it
--- a/tests/test-subrepo-git.t Wed Mar 14 16:26:14 2012 -0300
+++ b/tests/test-subrepo-git.t Sun Mar 18 18:21:32 2012 -0500
@@ -481,9 +481,7 @@
$ cd ..
Sticky repository, update --clean
- $ hg update --clean tip
- Previous HEAD position was aa84837... f
- HEAD is now at 32a3438... fff
+ $ hg update --clean tip 2>/dev/null
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n
7