aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2014-01-16 00:50:26 -0500
committerEric S. Raymond2014-01-16 00:50:26 -0500
commit7da02a6769e84cd0a9df8b1bc18ac78df1c0b058 (patch)
tree1a3f7051f11ea456f1ef229f2dae0290e05005f2
parent87b2a7f2da9a94f794f80494d2cf42b8c3e041f1 (diff)
downloademacs-7da02a6769e84cd0a9df8b1bc18ac78df1c0b058.tar.gz
emacs-7da02a6769e84cd0a9df8b1bc18ac78df1c0b058.zip
On VCS-independent ways of identifying commits, and why they are desirable.
No code changes.
-rw-r--r--Makefile.in1
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/notes/commits9
3 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index e69998e3e52..852a13407b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -385,6 +385,7 @@ src: Makefile FRC
385 cd $@ || exit; \ 385 cd $@ || exit; \
386 boot=bootstrap-emacs$(EXEEXT); \ 386 boot=bootstrap-emacs$(EXEEXT); \
387 [ ! -x "$$boot" ] || boot=''; \ 387 [ ! -x "$$boot" ] || boot=''; \
388 echo "VCSWITNESS: $$vcswitness";\
388 $(MAKE) all $(MFLAGS) \ 389 $(MAKE) all $(MFLAGS) \
389 CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ 390 CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
390 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \ 391 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 36a10fa5f30..111d6441518 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12014-01-16 Eric S. Raymond <esr@thyrsus.com>
2
3 * notes/commits: Add a 'graph on VCS-independent ways of
4 identifying commits and the desirability thereof.
5
12014-01-15 Paul Eggert <eggert@cs.ucla.edu> 62014-01-15 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Fix copyright license notices for Adobe Unicode mapping files. 8 Fix copyright license notices for Adobe Unicode mapping files.
diff --git a/admin/notes/commits b/admin/notes/commits
index 2c6f80c56f0..6e2aabe5abc 100644
--- a/admin/notes/commits
+++ b/admin/notes/commits
@@ -45,6 +45,15 @@ Date: Tue, 31 Mar 2009 12:21:20 +0900
45 for modern source-control systems with a global log, it's better to 45 for modern source-control systems with a global log, it's better to
46 have something like "Regenerate configure". 46 have something like "Regenerate configure".
47 47
48(4) (Added in 2014) In commit comments, and ChangLog files, it is best
49 to use ways of identifying revisions that are not dependent on a
50 particular version control system. (At time of writing Emacs is
51 about to move to its third VCS and another move in the future is
52 not impossible.) An excellent way to identify commits is by
53 quoting their summary line. Another is with an action stamp - an
54 RFC3339 date followed by ! followed by the committer's email - for
55 example, "2014-01-16T05:43:35Z!esr@thyrsus.com". Often, "my
56 previous commit" will suffice.
48 57
49Followup discussion: 58Followup discussion:
50http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00897.html 59http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00897.html