[PATCH] Fix Issue 2931: Can't add a svn subrepo with a svn:external file in it.

[Vasily Titskiy]

# HG changeset patch
# User Vasily Titskiy <qehgt0 at gmail.com>
# Date 1311874112 14400
# Node ID 42bbacebf053d63e10c218a71ee94d03e426a0f0
# Parent  b4c06b97dfe0cae28497bc3ab85c075a173de8e6
Fix Issue 2931: Can't add a svn subrepo with a svn:external file in it.

diff -r b4c06b97dfe0 -r 42bbacebf053 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Mon Jul 25 22:19:28 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:


  Vasily Titskiy