[Emacs-diffs] emacs-24 r117645: Minor fixes in the changes in preparation for git migration.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117645
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-10-31 11:32:11 +0200
message:
  Minor fixes in the changes in preparation for git migration.
  
   src/Makefile.in (repo-update): Fix a typo and slightly reword
   commentary.
  
   admin/notes/repo (Notes): Reword the stylistic guidance for commit log
   messages so that they are in line with Emacs development practices
   and style guidance.
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/notes/repo               bzr-20100518025134-ebvhi2w74h1r56u7-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-10-31 09:06:47 +0000
+++ b/admin/ChangeLog   2014-10-31 09:32:11 +0000
@@ -1,3 +1,9 @@
+2014-10-31  Eli Zaretskii  <address@hidden>
+
+       * notes/repo (Notes): Reword the stylistic guidance for commit log
+       messages so that they are in line with Emacs development practices
+       and style guidance.
+
 2014-10-31  Eric S. Raymond  <address@hidden>
 
        * notes/bzr: Renamed to notes/repo, reorganixed to separate

=== modified file 'admin/notes/repo'
--- a/admin/notes/repo  2014-10-31 09:06:47 +0000
+++ b/admin/notes/repo  2014-10-31 09:32:11 +0000
@@ -5,18 +5,15 @@
 Commits should follow the conventions used in all modern distributed
 version-control systems. That is, they should consist of
 
-- A self-contained topic line no more than 75 chars long.
-
-- If other content follows the topic line, there should be
-  a blank line separating the two.
-
-Try to keep your commits - and your commit comments - small.  If
-you feel an urge to put a bullet list in your commit comment, it's
-doing too many things at once.
-
-Yes, these directins are a departure from historical Emacs practice,
-but it helps modern log-viewing and summary tools work better so that
-other people can comprehend your code.
+- A self-contained topic line, preferably no more than 75 chars long.
+
+- If other content follows the topic line, there should be a blank
+  line separating the two.
+
+- Follow the blank line with ChangeLog-like entries for the specific
+  changes you made, if any.  (As long as Emacs maintains ChangeLog
+  files, just copy the entries you made in them to the commit message
+  after the blank line.)
 
 * Commit to the right branch
 
@@ -184,7 +181,7 @@
 trunk version.  Prior to bzr 2.2.3, this may fail.  You can just
 delete the .OTHER etc files by hand and use bzr resolve path/to/file.
 
-* Sanity-checking branch merges 
+* Sanity-checking branch merges
 
 Inspect the ChangeLog entries (e.g. in case too many entries have been
 included or whitespace between entries needs fixing).  bzrmerge tries

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-31 09:09:24 +0000
+++ b/lisp/ChangeLog    2014-10-31 09:32:11 +0000
@@ -1,3 +1,8 @@
+2014-10-31  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (repo-update): Fix a typo and slightly reword
+       commentary.
+
 2014-10-31  Glenn Morris  <address@hidden>
 
        * version.el (emacs-bzr-version, emacs-bzr-get-version):

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2014-10-31 09:03:23 +0000
+++ b/lisp/Makefile.in  2014-10-31 09:32:11 +0000
@@ -211,12 +211,12 @@
 # Some modes of make-dist use this.
 updates: update-subdirs autoloads finder-data custom-deps
 
-# This is useful after a repostiory fetch; but it doesn't do anything that a
-# plain "make" at top-level doesn't.
-# The only difference between this and this directory's "all" rule
-# is that this runs "autoloads" as well (because it uses "compile"
-# rather than "compile-main").  In a bootstrap, $(lisp) in src/Makefile
-# triggers this directory's autoloads rule.
+# This is useful after updating from the repository; but it doesn't do
+# anything that a plain "make" at top-level doesn't.  The only
+# difference between this and this directory's "all" rule is that this
+# runs "autoloads" as well (because it uses "compile" rather than
+# "compile-main").  In a bootstrap, $(lisp) in src/Makefile triggers
+# this directory's autoloads rule.
 repo-update: compile finder-data custom-deps
 
 # Update the AUTHORS file.