Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be

[be.git] / libbe / storage / vcs / darcs.py

diff --git a/libbe/storage/vcs/darcs.py b/libbe/storage/vcs/darcs.py
index 7ff45544adc6a960711835e341a4e8857ff67fed..29b25eb9b6890321dc6a63a189158dc7b22446ea 100644 (file)
--- a/libbe/storage/vcs/darcs.py
+++ b/libbe/storage/vcs/darcs.py
@@ -229,8 +229,9 @@ class Darcs(base.VCS):
                 descendents = [self._u_rel_path(f, path) for f in files
                                if f != '.']
             else:
-                descendents = [self._u_rel_path(f, path) for f in files
-                               if f.startswith(path)]
+                rel_files = [self._u_rel_path(f, path) for f in files]
+                descendents = [f for f in rel_files
+                               if f != '.' and not f.startswith('..')]
             return [f for f in descendents if f.count(os.path.sep) == 0]
         # Darcs versions <= 2.3.1 lack the --patch option for 'show files'
         raise NotImplementedError