diff mercurial/subrepo.py @ 13560:a2734c8322ac

merge with stable

--- a/mercurial/subrepo.py	Mon Mar 07 15:46:46 2011 -0600
+++ b/mercurial/subrepo.py	Mon Mar 07 23:19:17 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)