equal
deleted
inserted
replaced
698 # backup local changes in --force case |
698 # backup local changes in --force case |
699 for f in sorted(files): |
699 for f in sorted(files): |
700 absf = repo.wjoin(f) |
700 absf = repo.wjoin(f) |
701 if os.path.lexists(absf): |
701 if os.path.lexists(absf): |
702 self.ui.note(_('saving current version of %s as %s\n') % |
702 self.ui.note(_('saving current version of %s as %s\n') % |
703 (f, cmdutil.origpath(self.ui, repo, f))) |
703 (f, scmutil.origpath(self.ui, repo, f))) |
704 |
704 |
705 absorig = cmdutil.origpath(self.ui, repo, absf) |
705 absorig = scmutil.origpath(self.ui, repo, absf) |
706 if copy: |
706 if copy: |
707 util.copyfile(absf, absorig) |
707 util.copyfile(absf, absorig) |
708 else: |
708 else: |
709 util.rename(absf, absorig) |
709 util.rename(absf, absorig) |
710 |
710 |