From b8ff3a9f989e50efdffa0548055f70fb872304ea Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 31 Oct 2014 11:32:11 +0200 Subject: [PATCH] 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. --- admin/ChangeLog | 6 ++++++ admin/notes/repo | 19 ++++++++----------- lisp/ChangeLog | 5 +++++ lisp/Makefile.in | 12 ++++++------ 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 954574e7264..bd98be4ac72 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2014-10-31 Eli Zaretskii + + * 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 * notes/bzr: Renamed to notes/repo, reorganixed to separate diff --git a/admin/notes/repo b/admin/notes/repo index 858674e6b87..9b5e6ca9417 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -5,18 +5,15 @@ NOTES ON COMMITTING TO EMACS'S REPOSITORY -*- outline -*- 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. +- 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. +- 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. +- 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 @@ the trunk at all, use `bzr resolve path/to/file --take-this' to keep the 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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc5fae78970..b4dc92d442e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-31 Eli Zaretskii + + * Makefile.in (repo-update): Fix a typo and slightly reword + commentary. + 2014-10-31 Glenn Morris * version.el (emacs-bzr-version, emacs-bzr-get-version): diff --git a/lisp/Makefile.in b/lisp/Makefile.in index d90ced0cdcb..0f2c38b08bf 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -211,12 +211,12 @@ update-subdirs: doit # 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. -- 2.39.5