# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1314392904 18000
# Node ID 86380f24e6973b5015de67cc53ce7fcfdc9db3ae
# Parent  81f33be0ea794aa77b95b225de009240d73b525b# Parent  01cdfba22f0c1bfdc21feeb95b4d5d36219bafdd
merge with stable

diff -r 81f33be0ea79 -r 86380f24e697 .hgsigs
--- a/.hgsigs	Thu Aug 25 11:03:16 2011 +0200
+++ b/.hgsigs	Fri Aug 26 16:08:24 2011 -0500
@@ -41,3 +41,4 @@
 733af5d9f6b22387913e1d11350fb8cb7c1487dd 0 iD8DBQBN5q/8ywK+sNU5EO8RArRGAKCNGT94GKIYtSuwZ57z1sQbcw6uLACfffpbMV4NAPMl8womAwg+7ZPKnIU=
 de9eb6b1da4fc522b1cab16d86ca166204c24f25 0 iD8DBQBODhfhywK+sNU5EO8RAr2+AJ4ugbAj8ae8/K0bYZzx3sascIAg1QCeK3b+zbbVVqd3b7CDpwFnaX8kTd4=
 4a43e23b8c55b4566b8200bf69fe2158485a2634 0 iD8DBQBONzIMywK+sNU5EO8RAj5SAJ0aPS3+JHnyI6bHB2Fl0LImbDmagwCdGbDLp1S7TFobxXudOH49bX45Iik=
+d629f1e89021103f1753addcef6b310e4435b184 0 iD8DBQBOWAsBywK+sNU5EO8RAht4AJwJl9oNFopuGkj5m8aKuf7bqPkoAQCeNrEm7UhFsZKYT5iUOjnMV7s2LaM=
diff -r 81f33be0ea79 -r 86380f24e697 .hgtags
--- a/.hgtags	Thu Aug 25 11:03:16 2011 +0200
+++ b/.hgtags	Fri Aug 26 16:08:24 2011 -0500
@@ -53,3 +53,4 @@
 733af5d9f6b22387913e1d11350fb8cb7c1487dd 1.8.4
 de9eb6b1da4fc522b1cab16d86ca166204c24f25 1.9
 4a43e23b8c55b4566b8200bf69fe2158485a2634 1.9.1
+d629f1e89021103f1753addcef6b310e4435b184 1.9.2
diff -r 81f33be0ea79 -r 86380f24e697 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Thu Aug 25 11:03:16 2011 +0200
+++ b/mercurial/subrepo.py	Fri Aug 26 16:08:24 2011 -0500
@@ -204,7 +204,7 @@
         parent = _abssource(repo._subparent, push, abort=False)
         if parent:
             parent = util.url(parent)
-            parent.path = posixpath.join(parent.path, source.path)
+            parent.path = posixpath.join(parent.path or '', source.path)
             parent.path = posixpath.normpath(parent.path)
             return str(parent)
     else: # recursion reached top repo
diff -r 81f33be0ea79 -r 86380f24e697 tests/test-http.t
--- a/tests/test-http.t	Thu Aug 25 11:03:16 2011 +0200
+++ b/tests/test-http.t	Fri Aug 26 16:08:24 2011 -0500
@@ -159,6 +159,32 @@
 
   $ cd ..
 
+clone of serve with repo in root and unserved subrepo (issue2970)
+
+  $ hg --cwd test init sub
+  $ hg --cwd test/sub tag something
+  $ echo sub = sub > test/.hgsub
+  $ hg --cwd test add .hgsub
+  $ hg --cwd test commit -qm 'add subrepo'
+  $ hg clone http://localhost:$HGPORT noslash-clone
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 3 changesets with 7 changes to 7 files
+  updating to branch default
+  abort: HTTP Error 404: Not Found
+  [255]
+  $ hg clone http://localhost:$HGPORT/ slash-clone
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 3 changesets with 7 changes to 7 files
+  updating to branch default
+  abort: HTTP Error 404: Not Found
+  [255]
+
 check error log
 
   $ cat error.log