Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 14999:f6a737357195

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Aug 2011 10:54:34 -0500
parents c035f1c53e39 a115b5ee9c63
children 86380f24e697
line wrap: on
line diff
--- a/mercurial/subrepo.py	Sun Jul 31 22:12:13 2011 +0200
+++ b/mercurial/subrepo.py	Mon Aug 01 10:54:34 2011 -0500
@@ -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: