##// END OF EJS Templates
subrepo: always show relative path to .orig backup...
Martin von Zweigbergk -
r41733:59025c9b default
parent child Browse files
Show More
@@ -1830,7 +1830,7 b' class gitsubrepo(abstractsubrepo):'
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
@@ -925,7 +925,7 b' revert moves orig files to the right pla'
925 $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
925 $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
926 reverting subrepo ../gitroot
926 reverting subrepo ../gitroot
927 creating directory: $TESTTMP/tc/.hg/origbackups
927 creating directory: $TESTTMP/tc/.hg/origbackups
928 saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar
928 saving current version of foobar as .hg/origbackups/foobar
929 $ ls .hg/origbackups
929 $ ls .hg/origbackups
930 foobar
930 foobar
931 $ rm -rf .hg/origbackups
931 $ rm -rf .hg/origbackups
General Comments 0
You need to be logged in to leave comments. Login now