[Emacs-diffs] emacs-24 r117644: Yet another change for git migration backported from trunk.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117644
revision-id: address@hidden
parent: address@hidden
author: Glenn Morris <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-10-31 11:09:24 +0200
message:
  Yet another change for git migration backported from trunk.
  
   lisp/version.el (emacs-bzr-version, emacs-bzr-get-version):
   Revert 2014-10-31 change.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/version.el                version.el-20091113204419-o5vbwnq5f7feedwu-1613

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-31 09:06:47 +0000
+++ b/lisp/ChangeLog    2014-10-31 09:09:24 +0000
@@ -1,3 +1,8 @@
+2014-10-31  Glenn Morris  <address@hidden>
+
+       * version.el (emacs-bzr-version, emacs-bzr-get-version):
+       Revert 2014-10-31 change.
+
 2014-10-31  Eric S. Raymond  <address@hidden>
 
        * version.el: Fix some fallback values to conform to the actual

=== modified file 'lisp/version.el'
--- a/lisp/version.el   2014-10-31 09:06:47 +0000
+++ b/lisp/version.el   2014-10-31 09:09:24 +0000
@@ -91,7 +91,7 @@
 or if we could not determine the revision.")
 
 (define-obsolete-variable-alias 'emacs-bzr-version
-                                'emacs-repository-version "25.1")
+                                'emacs-repository-version "24.4")
 
 (defun emacs-bzr-version-dirstate (dir)
   "Try to return as a string the bzr revision ID of directory DIR.
@@ -129,7 +129,7 @@
         (buffer-string))))
 
 (define-obsolete-function-alias 'emacs-bzr-get-version
-                                'emacs-repository-get-version "25.1")
+                                'emacs-repository-get-version "24.4")
 
 (defun emacs-repository-get-version (&optional dir external)
   "Try to return as a string the repository revision of the Emacs sources.