From bc86f573eecb9067dfb73c612309a909332bb15d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 21 Dec 2011 15:46:49 +0800 Subject: [PATCH] * vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in filename arg. --- lisp/ChangeLog | 5 +++++ lisp/vc/vc-bzr.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 01c03c2baf6..27e8bcd0add 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-12-21 Chong Yidong + + * vc/vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in + filename argument. + 2011-12-20 Martin Rudalics * window.el (window-normalize-buffer-to-display): Remove. diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index c5c0ce73b3a..508420f026a 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -764,7 +764,10 @@ REV non-nil gets an error." (defun vc-bzr-rename-file (old new) "Rename file from OLD to NEW using `bzr mv'." - (vc-bzr-command "mv" nil 0 new old)) + (setq old (expand-file-name old)) + (setq new (expand-file-name new)) + (vc-bzr-command "mv" nil 0 new old) + (message "Renamed %s => %s" old new)) (defvar vc-bzr-annotation-table nil "Internal use.") -- 2.39.2