# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1288967739 -3600
# Node ID 7ff1c4542b9da15e8ebe108f569da09f6cc54b80
# Parent  515c2786e1cfc4a823458df20118a2072cb27864# Parent  9bb180abc4d07f1b6fac20125e8c14f245c2e057
merge with stable

diff -r 515c2786e1cf -r 7ff1c4542b9d mercurial/subrepo.py
--- 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]])
diff -r 515c2786e1cf -r 7ff1c4542b9d tests/test-subrepo-svn.t
--- 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