Show More
@@ -1810,11 +1810,15 b' class gitsubrepo(abstractsubrepo):' | |||||
1810 | if not opts.get(r'no_backup'): |
|
1810 | if not opts.get(r'no_backup'): | |
1811 | status = self.status(None) |
|
1811 | status = self.status(None) | |
1812 | names = status.modified |
|
1812 | names = status.modified | |
|
1813 | origvfs = scmutil.getorigvfs(self.ui, self._subparent) | |||
|
1814 | if origvfs is None: | |||
|
1815 | origvfs = self.wvfs | |||
1813 | for name in names: |
|
1816 | for name in names: | |
1814 | bakname = scmutil.origpath(self.ui, self._subparent, name) |
|
1817 | bakname = scmutil.origpath(self.ui, self._subparent, name) | |
1815 | self.ui.note(_('saving current version of %s as %s\n') % |
|
1818 | self.ui.note(_('saving current version of %s as %s\n') % | |
1816 | (name, bakname)) |
|
1819 | (name, bakname)) | |
1817 |
self.wvfs. |
|
1820 | name = self.wvfs.join(name) | |
|
1821 | origvfs.rename(name, bakname) | |||
1818 |
|
1822 | |||
1819 | if not opts.get(r'dry_run'): |
|
1823 | if not opts.get(r'dry_run'): | |
1820 | self.get(substate, overwrite=True) |
|
1824 | self.get(substate, overwrite=True) |
General Comments 0
You need to be logged in to leave comments.
Login now