aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-11-24 03:44:42 +0200
committerDmitry Gutov2014-11-24 03:44:42 +0200
commit7aac8f171bc163972dfa972a2ffe0daa089b155b (patch)
tree7f86835608e8a955fe48805af4e6a377b415d7ee
parent4de28b1a76a6b5fe86122ab4dea9c7764d8b5866 (diff)
downloademacs-7aac8f171bc163972dfa972a2ffe0daa089b155b.tar.gz
emacs-7aac8f171bc163972dfa972a2ffe0daa089b155b.zip
Fixes: debbugs:18579
* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored files.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-bzr.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afa0c680a8b..5c367b49cb8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-24 Dmitry Gutov <dgutov@yandex.ru>
2
3 * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored
4 files. (Bug#18579)
5
12014-11-23 Michael Albinus <michael.albinus@gmx.de> 62014-11-23 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for 8 * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index e607f9d8d1a..66c7ac4a349 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -983,7 +983,7 @@ stream. Standard error output is discarded."
983 (push (list new-name 'edited 983 (push (list new-name 'edited
984 (vc-bzr-create-extra-fileinfo old-name)) result))) 984 (vc-bzr-create-extra-fileinfo old-name)) result)))
985 ;; do nothing for non existent files 985 ;; do nothing for non existent files
986 ((memq translated '(not-found ignored))) 986 ((eq translated 'not-found))
987 (t 987 (t
988 (push (list (file-relative-name 988 (push (list (file-relative-name
989 (buffer-substring-no-properties 989 (buffer-substring-no-properties