Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Sun, 14 Feb 2010 13:05:51 +0100
changeset 10458 7fbba0c04f92
parent 10455 40dfd46d098f (current diff)
parent 10457 4f38d03d4975 (diff)
child 10460 14184a2ac46a
Merge with crew-stable
--- a/mercurial/subrepo.py	Sun Feb 07 14:56:18 2010 +0100
+++ b/mercurial/subrepo.py	Sun Feb 14 13:05:51 2010 +0100
@@ -41,7 +41,7 @@
                 raise util.Abort(_('missing ] in subrepo source'))
             kind, src = src.split(']', 1)
             kind = kind[1:]
-        state[path] = (src, rev.get(path, ''), kind)
+        state[path] = (src.strip(), rev.get(path, ''), kind)
 
     return state
 
--- a/tests/test-subrepo-svn	Sun Feb 07 14:56:18 2010 +0100
+++ b/tests/test-subrepo-svn	Sun Feb 14 13:05:51 2010 +0100
@@ -49,8 +49,8 @@
 echo a > a
 hg ci -Am0
 
-echo % add first svn sub
-echo "s = [svn]$SVNREPO/src" >> .hgsub
+echo % add first svn sub with leading whitespaces
+echo "s = [svn]       $SVNREPO/src" >> .hgsub
 svn co --quiet $SVNREPO/src s
 hg add .hgsub
 hg ci -m1
--- a/tests/test-subrepo-svn.out	Sun Feb 07 14:56:18 2010 +0100
+++ b/tests/test-subrepo-svn.out	Sun Feb 14 13:05:51 2010 +0100
@@ -18,7 +18,7 @@
 % create hg repo
 % first revision, no sub
 adding a
-% add first svn sub
+% add first svn sub with leading whitespaces
 committing subrepository s
 % debugsub
 path s
mercurial