Mercurial > hg
changeset 13333:60792fa3c1a8
Merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 01 Feb 2011 21:59:07 +0100 |
| parents | 9f2c6892e004 (current diff) 927e3940bfc3 (diff) |
| children | c86db7b1681e |
| files | mercurial/subrepo.py |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/win32mbcs.py Mon Jan 31 19:19:56 2011 -0500 +++ b/hgext/win32mbcs.py Tue Feb 01 21:59:07 2011 +0100 @@ -34,7 +34,7 @@ - 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::
--- a/mercurial/subrepo.py Mon Jan 31 19:19:56 2011 -0500 +++ b/mercurial/subrepo.py Tue Feb 01 21:59:07 2011 +0100 @@ -601,7 +601,7 @@ 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])
--- a/tests/test-subrepo-svn.t Mon Jan 31 19:19:56 2011 -0500 +++ b/tests/test-subrepo-svn.t Tue Feb 01 21:59:07 2011 +0100 @@ -280,15 +280,15 @@ 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