aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-03-28 11:26:37 +0800
committerLeo Liu2013-03-28 11:26:37 +0800
commitf67bfbcfc00a1465c24da88e507afc692cf93aa1 (patch)
tree433a71beb2056b904eb849d6ea87da3c9c1226fa
parent5c89ca240d7efa68b29651b34b8fbca172a5f75a (diff)
downloademacs-f67bfbcfc00a1465c24da88e507afc692cf93aa1.tar.gz
emacs-f67bfbcfc00a1465c24da88e507afc692cf93aa1.zip
* vc/vc-bzr.el (vc-bzr-revert): Don't backup.
Fixes: debbugs:14066
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/vc-bzr.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00a105b5142..6ba1ace546a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-03-28 Leo Liu <sdl.web@gmail.com>
2
3 * vc/vc-bzr.el (vc-bzr-revert): Don't backup. (Bug#14066)
4
12013-03-27 Eli Zaretskii <eliz@gnu.org> 52013-03-27 Eli Zaretskii <eliz@gnu.org>
2 6
3 * facemenu.el (list-colors-callback): New defvar. 7 * facemenu.el (list-colors-callback): New defvar.
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index d0912cb719c..d72c1f7f859 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -653,7 +653,7 @@ REV non-nil gets an error."
653 653
654(defun vc-bzr-revert (file &optional contents-done) 654(defun vc-bzr-revert (file &optional contents-done)
655 (unless contents-done 655 (unless contents-done
656 (with-temp-buffer (vc-bzr-command "revert" t 0 file)))) 656 (with-temp-buffer (vc-bzr-command "revert" t 0 file "--no-backup"))))
657 657
658(defvar log-view-message-re) 658(defvar log-view-message-re)
659(defvar log-view-file-re) 659(defvar log-view-file-re)