Show More
@@ -204,7 +204,7 b' def _abssource(repo, push=False, abort=T' | |||||
204 | parent = _abssource(repo._subparent, push, abort=False) |
|
204 | parent = _abssource(repo._subparent, push, abort=False) | |
205 | if parent: |
|
205 | if parent: | |
206 | parent = util.url(parent) |
|
206 | parent = util.url(parent) | |
207 | parent.path = posixpath.join(parent.path, source.path) |
|
207 | parent.path = posixpath.join(parent.path or '', source.path) | |
208 | parent.path = posixpath.normpath(parent.path) |
|
208 | parent.path = posixpath.normpath(parent.path) | |
209 | return str(parent) |
|
209 | return str(parent) | |
210 | else: # recursion reached top repo |
|
210 | else: # recursion reached top repo |
@@ -159,6 +159,32 b' test http authentication' | |||||
159 |
|
159 | |||
160 | $ cd .. |
|
160 | $ cd .. | |
161 |
|
161 | |||
|
162 | clone of serve with repo in root and unserved subrepo (issue2970) | |||
|
163 | ||||
|
164 | $ hg --cwd test init sub | |||
|
165 | $ hg --cwd test/sub tag something | |||
|
166 | $ echo sub = sub > test/.hgsub | |||
|
167 | $ hg --cwd test add .hgsub | |||
|
168 | $ hg --cwd test commit -qm 'add subrepo' | |||
|
169 | $ hg clone http://localhost:$HGPORT noslash-clone | |||
|
170 | requesting all changes | |||
|
171 | adding changesets | |||
|
172 | adding manifests | |||
|
173 | adding file changes | |||
|
174 | added 3 changesets with 7 changes to 7 files | |||
|
175 | updating to branch default | |||
|
176 | abort: HTTP Error 404: Not Found | |||
|
177 | [255] | |||
|
178 | $ hg clone http://localhost:$HGPORT/ slash-clone | |||
|
179 | requesting all changes | |||
|
180 | adding changesets | |||
|
181 | adding manifests | |||
|
182 | adding file changes | |||
|
183 | added 3 changesets with 7 changes to 7 files | |||
|
184 | updating to branch default | |||
|
185 | abort: HTTP Error 404: Not Found | |||
|
186 | [255] | |||
|
187 | ||||
162 | check error log |
|
188 | check error log | |
163 |
|
189 | |||
164 | $ cat error.log |
|
190 | $ cat error.log |
General Comments 0
You need to be logged in to leave comments.
Login now