Show More
@@ -1290,7 +1290,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1290 | return retdata, p.returncode |
|
1290 | return retdata, p.returncode | |
1291 |
|
1291 | |||
1292 | def _gitmissing(self): |
|
1292 | def _gitmissing(self): | |
1293 |
return not |
|
1293 | return not self.wvfs.exists('.git') | |
1294 |
|
1294 | |||
1295 | def _gitstate(self): |
|
1295 | def _gitstate(self): | |
1296 | return self._gitcommand(['rev-parse', 'HEAD']) |
|
1296 | return self._gitcommand(['rev-parse', 'HEAD']) | |
@@ -1804,8 +1804,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1804 | bakname = "%s.orig" % name |
|
1804 | bakname = "%s.orig" % name | |
1805 | self.ui.note(_('saving current version of %s as %s\n') % |
|
1805 | self.ui.note(_('saving current version of %s as %s\n') % | |
1806 | (name, bakname)) |
|
1806 | (name, bakname)) | |
1807 |
|
|
1807 | self.wvfs.rename(name, bakname) | |
1808 | os.path.join(self._abspath, bakname)) |
|
|||
1809 |
|
1808 | |||
1810 | if not opts.get('dry_run'): |
|
1809 | if not opts.get('dry_run'): | |
1811 | self.get(substate, overwrite=True) |
|
1810 | self.get(substate, overwrite=True) |
General Comments 0
You need to be logged in to leave comments.
Login now