##// END OF EJS Templates
mq: always show relative path to .orig backup...
Martin von Zweigbergk -
r41732:e67a85e0 default
parent child Browse files
Show More
@@ -738,10 +738,10 b' class queue(object):'
738 for f in sorted(files):
738 for f in sorted(files):
739 absf = repo.wjoin(f)
739 absf = repo.wjoin(f)
740 if os.path.lexists(absf):
740 if os.path.lexists(absf):
741 absorig = scmutil.origpath(self.ui, repo, absf)
741 self.ui.note(_('saving current version of %s as %s\n') %
742 self.ui.note(_('saving current version of %s as %s\n') %
742 (f, scmutil.origpath(self.ui, repo, f)))
743 (f, os.path.relpath(absorig)))
743
744
744 absorig = scmutil.origpath(self.ui, repo, absf)
745 if copy:
745 if copy:
746 util.copyfile(absf, absorig)
746 util.copyfile(absf, absorig)
747 else:
747 else:
@@ -1406,7 +1406,7 b' apply force, should discard changes in h'
1406 $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups'
1406 $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups'
1407 applying empty
1407 applying empty
1408 creating directory: $TESTTMP/forcepush/.hg/origbackups
1408 creating directory: $TESTTMP/forcepush/.hg/origbackups
1409 saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt
1409 saving current version of hello.txt as .hg/origbackups/hello.txt
1410 patching file hello.txt
1410 patching file hello.txt
1411 committing files:
1411 committing files:
1412 hello.txt
1412 hello.txt
General Comments 0
You need to be logged in to leave comments. Login now