Mercurial > hg

changeset 14994:a115b5ee9c63 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: handle adding svn subrepo with a svn:external file in it (issue2931)
author Vasily Titskiy <qehgt0@gmail.com>
date Thu, 28 Jul 2011 13:28:32 -0400
parents e5b2ee5157ae
children a5d449fc5e07
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Sat Jul 30 23:41:10 2011 +0300
+++ b/mercurial/subrepo.py	Thu Jul 28 13:28:32 2011 -0400
@@ -606,7 +606,7 @@
             if item == 'external':
                 externals.append(path)
             if (item not in ('', 'normal', 'unversioned', 'external')
-                or props not in ('', 'none')):
+                or props not in ('', 'none', 'normal')):
                 changes.append(path)
         for path in changes:
             for ext in externals: