# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2011-02-01 20:39:28
# Node ID 927e3940bfc3845989112b00c7e7ec5f58a72e9d
# Parent  551856dea9a6394da69d27869f566caf227d4fba

subrepo: fix update -C with svn subrepos when cwd != repo.root

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -591,7 +591,7 @@ class svnsubrepo(abstractsubrepo):
 
     def get(self, state, overwrite=False):
         if overwrite:
-            self._svncommand(['revert', '--recursive', self._path])
+            self._svncommand(['revert', '--recursive'])
         status = self._svncommand(['checkout', state[0], '--revision', state[1]])
         if not re.search('Checked out revision [0-9]+.', status):
             raise util.Abort(status.splitlines()[-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
@@ -280,15 +280,15 @@ Check hg update --clean
   A       f1
   
   Performing status on external item at 'externals'
-  $ cd ..
-  $ hg update -C
+  $ cd ../..
+  $ hg -R t update -C
   
-  Fetching external item into '$TESTTMP/sub/t/s/externals'
+  Fetching external item into 't/s/externals'
   Checked out external at revision 1.
   
   Checked out revision 3.
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd s
+  $ cd t/s
   $ svn status
   ?       a
   X       externals