Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 13559:42a34c0aeddc stable
subrepo: backout 67fbe566eff1, --force requires svn >= 1.5
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 07 Mar 2011 23:02:04 +0100 |
| parents | dea6efdd7ec4 |
| children | a2734c8322ac a7c9735307bd |
line wrap: on
line diff
--- a/mercurial/subrepo.py Mon Mar 07 15:46:28 2011 -0600 +++ b/mercurial/subrepo.py Mon Mar 07 23:02:04 2011 +0100 @@ -625,8 +625,7 @@ def get(self, state, overwrite=False): if overwrite: self._svncommand(['revert', '--recursive']) - status = self._svncommand(['checkout', '--force', state[0], - '--revision', state[1]]) + 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]) self._ui.status(status)