Mercurial > public > mercurial-scm > hg
diff mercurial/subrepo.py @ 13532:d4c2f2ac3ff7
Merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 04 Mar 2011 14:11:15 +0100 |
| parents | c12088259f64 67fbe566eff1 |
| children | f854b775c386 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Thu Mar 03 22:41:38 2011 +0100 +++ b/mercurial/subrepo.py Fri Mar 04 14:11:15 2011 +0100 @@ -625,7 +625,8 @@ def get(self, state, overwrite=False): if overwrite: self._svncommand(['revert', '--recursive']) - status = self._svncommand(['checkout', state[0], '--revision', state[1]]) + status = self._svncommand(['checkout', '--force', 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)