--- a/hgext/convert/bzr.py Fri Apr 24 00:06:01 2009 -0700
+++ b/hgext/convert/bzr.py Fri Apr 24 10:43:12 2009 +0200
@@ -192,7 +192,7 @@
# populate the mode cache
kind, executable = [e[1] for e in (kind, executable)]
- mode = ((executable and 'x') or (kind == 'symlink' and 's')
+ mode = ((executable and 'x') or (kind == 'symlink' and 'l')
or '')
self._modecache[(topath, revid)] = mode
changes.append((topath, revid))
--- a/tests/test-convert-bzr Fri Apr 24 00:06:01 2009 -0700
+++ b/tests/test-convert-bzr Fri Apr 24 10:43:12 2009 +0200
@@ -72,7 +72,10 @@
touch program
chmod +x program
ln -s program altname
-bzr add -q altname program
+mkdir d
+echo a > d/a
+ln -s a syma
+bzr add -q altname program syma d/a
bzr commit -q -m 'Initial setup'
touch newprog
chmod +x newprog
--- a/tests/test-convert-bzr.out Fri Apr 24 00:06:01 2009 -0700
+++ b/tests/test-convert-bzr.out Fri Apr 24 10:43:12 2009 +0200
@@ -50,9 +50,13 @@
1 Initial setup
0 Symlink changed, x bits changed
% manifest of 0
-644 altname
+644 @ altname
+644 d/a
755 * program
+644 @ syma
% manifest of tip
-644 altname
+644 @ altname
+644 d/a
755 * newprog
644 program
+644 @ syma