diff options
| author | Chong Yidong | 2011-12-21 15:46:49 +0800 |
|---|---|---|
| committer | Chong Yidong | 2011-12-21 15:46:49 +0800 |
| commit | bc86f573eecb9067dfb73c612309a909332bb15d (patch) | |
| tree | 03a0dfbfe136879a4cbb90355d41fef840e1070f | |
| parent | 678f4426c3e42029becee680b99f31d5cd254626 (diff) | |
| download | emacs-bc86f573eecb9067dfb73c612309a909332bb15d.tar.gz emacs-bc86f573eecb9067dfb73c612309a909332bb15d.zip | |
* vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in filename arg.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-bzr.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 01c03c2baf6..27e8bcd0add 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-12-21 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * vc/vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in | ||
| 4 | filename argument. | ||
| 5 | |||
| 1 | 2011-12-20 Martin Rudalics <rudalics@gmx.at> | 6 | 2011-12-20 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * window.el (window-normalize-buffer-to-display): Remove. | 8 | * 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." | |||
| 764 | 764 | ||
| 765 | (defun vc-bzr-rename-file (old new) | 765 | (defun vc-bzr-rename-file (old new) |
| 766 | "Rename file from OLD to NEW using `bzr mv'." | 766 | "Rename file from OLD to NEW using `bzr mv'." |
| 767 | (vc-bzr-command "mv" nil 0 new old)) | 767 | (setq old (expand-file-name old)) |
| 768 | (setq new (expand-file-name new)) | ||
| 769 | (vc-bzr-command "mv" nil 0 new old) | ||
| 770 | (message "Renamed %s => %s" old new)) | ||
| 768 | 771 | ||
| 769 | (defvar vc-bzr-annotation-table nil | 772 | (defvar vc-bzr-annotation-table nil |
| 770 | "Internal use.") | 773 | "Internal use.") |