--- a/mercurial/subrepo.py Thu Nov 04 17:09:00 2010 -0500
+++ b/mercurial/subrepo.py Fri Nov 05 15:35:39 2010 +0100
@@ -549,7 +549,7 @@
'it has changes.\n' % self._path))
return
self._ui.note(_('removing subrepo %s\n') % self._path)
- shutil.rmtree(self._ctx.repo.join(self._path))
+ shutil.rmtree(self._ctx._repo.wjoin(self._path))
def get(self, state):
status = self._svncommand(['checkout', state[0], '--revision', state[1]])
--- a/tests/test-subrepo-svn.t Thu Nov 04 17:09:00 2010 -0500
+++ b/tests/test-subrepo-svn.t Fri Nov 05 15:35:39 2010 +0100
@@ -217,3 +217,8 @@
$ python -c "import os.path; print os.path.exists('s')"
True
+
+update to nullrev (must delete the subrepo)
+
+ $ hg up null
+ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved