equal
deleted
inserted
replaced
1828 if origvfs is None: |
1828 if origvfs is None: |
1829 origvfs = self.wvfs |
1829 origvfs = self.wvfs |
1830 for name in names: |
1830 for name in names: |
1831 bakname = scmutil.origpath(self.ui, self._subparent, name) |
1831 bakname = scmutil.origpath(self.ui, self._subparent, name) |
1832 self.ui.note(_('saving current version of %s as %s\n') % |
1832 self.ui.note(_('saving current version of %s as %s\n') % |
1833 (name, bakname)) |
1833 (name, os.path.relpath(bakname))) |
1834 name = self.wvfs.join(name) |
1834 name = self.wvfs.join(name) |
1835 origvfs.rename(name, bakname) |
1835 origvfs.rename(name, bakname) |
1836 |
1836 |
1837 if not opts.get(r'dry_run'): |
1837 if not opts.get(r'dry_run'): |
1838 self.get(substate, overwrite=True) |
1838 self.get(substate, overwrite=True) |