diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -34,7 +34,7 @@ Note that there are some limitations on - You should use single encoding in one repository. - If the repository path ends with 0x5c, .hg/hgrc cannot be read. -- win32mbcs is not compatible with fixutf8 extention. +- win32mbcs is not compatible with fixutf8 extension. By default, win32mbcs uses encoding.encoding decided by Mercurial. You can specify the encoding by config option:: diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -601,7 +601,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