Improve emacs-bzr-version for lightweight checkouts (bug#12441)

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e27fa53..34c6d98 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-15  Glenn Morris  <rgm@gnu.org>
+
+       * version.el (emacs-bzr-version): Doc fix.
+       (emacs-bzr-version-dirstate): New function.
+       (emacs-bzr-get-version): For lightweight checkouts, if the parent
+       is local try and check that it matches the branch.  If not, just
+       use dirstate information.  (Bug#12441)
+
 2012-09-14  Juri Linkov  <juri@jurta.org>
 
        * dired-aux.el (dired-do-chmod): Use `eq' to detect empty input.