Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 13333:60792fa3c1a8
Merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 01 Feb 2011 21:59:07 +0100 |
| parents | 7ebdfa37842e 927e3940bfc3 |
| children | fa921dcd9993 |
line wrap: on
line diff
--- 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])