# HG changeset patch
# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
# Date 2010-11-05 14:13:22
# Node ID 9bb180abc4d07f1b6fac20125e8c14f245c2e057
# Parent  f766882000c7bf2596e98abd43e460322a87c02c

subrepo: test & fix svn subrepo removal

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -549,7 +549,7 @@ class svnsubrepo(abstractsubrepo):
                             '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]])
diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -217,3 +217,8 @@ verify subrepo is contained within the r
 
   $ 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