diff options
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | admin/ChangeLog | 5 | ||||
-rw-r--r-- | admin/notes/commits | 9 |
3 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index e69998e3e5..852a13407b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -385,6 +385,7 @@ src: Makefile FRC cd $@ || exit; \ boot=bootstrap-emacs$(EXEEXT); \ [ ! -x "$$boot" ] || boot=''; \ + echo "VCSWITNESS: $$vcswitness";\ $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \ diff --git a/admin/ChangeLog b/admin/ChangeLog index 36a10fa5f3..111d644151 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2014-01-16 Eric S. Raymond <esr@thyrsus.com> + + * notes/commits: Add a 'graph on VCS-independent ways of + identifying commits and the desirability thereof. + 2014-01-15 Paul Eggert <eggert@cs.ucla.edu> Fix copyright license notices for Adobe Unicode mapping files. diff --git a/admin/notes/commits b/admin/notes/commits index 2c6f80c56f..6e2aabe5ab 100644 --- a/admin/notes/commits +++ b/admin/notes/commits @@ -45,6 +45,15 @@ Date: Tue, 31 Mar 2009 12:21:20 +0900 for modern source-control systems with a global log, it's better to have something like "Regenerate configure". +(4) (Added in 2014) In commit comments, and ChangLog files, it is best + to use ways of identifying revisions that are not dependent on a + particular version control system. (At time of writing Emacs is + about to move to its third VCS and another move in the future is + not impossible.) An excellent way to identify commits is by + quoting their summary line. Another is with an action stamp - an + RFC3339 date followed by ! followed by the committer's email - for + example, "2014-01-16T05:43:35Z!esr@thyrsus.com". Often, "my + previous commit" will suffice. Followup discussion: http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00897.html |