4:25 p.m.
APPROVE COMMIT 21.5
I'm not sure how this happened, whether it's a side effect of a
Mercurial operation or a careless merge by hand, but please be really
careful to ensure that the release Herald markers are not disturbed
when pushing. It would be nice if the logs were in order of commits
(and there are definitely similar artifacts in several logs), but it's
not such a big deal within a version. It is important that commits
that occur *after* a release do not appear in the logs *before* the
release and vice versa.
diff -r 9dc294ae3004 -r 9f1c9f957073 lisp/ChangeLog
--- a/lisp/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/lisp/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -51,15 +51,15 ＠＠
Removed. Move this to C, so we can use
look_for_coding_system_magic_cookie().
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-14 Aidan Kehoe <kehoea(a)parhasard.net>
* byte-optimize.el (byte-optimize-letX):
diff -r 9dc294ae3004 -r 9f1c9f957073 man/ChangeLog
--- a/man/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/man/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -17,10 +17,6 ＠＠
Document the new syntax of ## for the symbol with name "" interned
in obarray.
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* lispref/keymaps.texi (Keymaps):
＠＠ -31,6 +27,10 ＠＠
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-06 Aidan Kehoe <kehoea(a)parhasard.net>
* lispref/macros.texi (Expansion):
diff -r 9dc294ae3004 -r 9f1c9f957073 src/ChangeLog
--- a/src/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/src/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -89,10 +89,6 ＠＠
Adopt GNU's ## syntax for the interned symbol with the zero-length
name.
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* keymap.c:
＠＠ -128,6 +124,10 ＠＠
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-14 Aidan Kehoe <kehoea(a)parhasard.net>
* minibuf.c (Ftest_completion):
diff -r 9dc294ae3004 -r 9f1c9f957073 tests/ChangeLog
--- a/tests/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/tests/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -14,15 +14,15 ＠＠
Make sure we can search for character ranges successfully when the
syntax table is dirty.
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-12 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el:
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
12:05 p.m.
>>>> Stephen J Turnbull <stephen(a)xemacs.org> writes:
I'm not sure how this happened, whether it's a side effect of
a
Mercurial operation or a careless merge by hand, but please be
really careful to ensure that the release Herald markers are not
disturbed when pushing.
I haven't analyzed this particular case but the ChangeLogs are a
problem. They don't mix well with the version control system. For your
own administration you want to add them while your doing the
change. But for the outside world they would better be added at the
moment the change is pushed. Which might be much later.
I have had lots of good use of ChangeLogs before but with mercurial it
might be possible to move over to auto generating the ChangeLogs or
similar? You will miss the detailed description of the change for each
file but you will gain the overall comments for the whole commit that
you now must go over to mercurial to see.
Yours
--
%% Mats
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
11:06 a.m.
Ar an ceathrú lá is fiche de mí na Nollaig, scríobh Stephen J. Turnbull:
APPROVE COMMIT 21.5
I'm not sure how this happened, whether it's a side effect of a
Mercurial operation or a careless merge by hand, but please be really
careful to ensure that the release Herald markers are not disturbed
when pushing. It would be nice if the logs were in order of commits
(and there are definitely similar artifacts in several logs), but it's
not such a big deal within a version.
It is important that commits that occur *after* a release do not
appear
in the logs *before* the release and vice versa.
Personally I don’t think it is that important, because if we’re going to
have branches that we merge, this will arise all the time (or we will end up
merging huge ChangeLog.GTK files, giving no real useful history in the
VCS for annotation).
I think it’s more important that the annotation of the corresponding part of
the ChangeLog, if we’re going to use ChangeLog files, reflects the changeset
ID of the changes to the code, something that changes like your commit can
break. Your particular commit did not break this, for which thank you!
diff -r 9dc294ae3004 -r 9f1c9f957073 lisp/ChangeLog
--- a/lisp/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/lisp/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -51,15 +51,15 ＠＠
Removed. Move this to C, so we can use
look_for_coding_system_magic_cookie().
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-14 Aidan Kehoe <kehoea(a)parhasard.net>
* byte-optimize.el (byte-optimize-letX):
diff -r 9dc294ae3004 -r 9f1c9f957073 man/ChangeLog
--- a/man/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/man/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -17,10 +17,6 ＠＠
Document the new syntax of ## for the symbol with name "" interned
in obarray.
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* lispref/keymaps.texi (Keymaps):
＠＠ -31,6 +27,10 ＠＠
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-06 Aidan Kehoe <kehoea(a)parhasard.net>
* lispref/macros.texi (Expansion):
diff -r 9dc294ae3004 -r 9f1c9f957073 src/ChangeLog
--- a/src/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/src/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -89,10 +89,6 ＠＠
Adopt GNU's ## syntax for the interned symbol with the zero-length
name.
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* keymap.c:
＠＠ -128,6 +124,10 ＠＠
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-14 Aidan Kehoe <kehoea(a)parhasard.net>
* minibuf.c (Ftest_completion):
diff -r 9dc294ae3004 -r 9f1c9f957073 tests/ChangeLog
--- a/tests/ChangeLog Fri Dec 14 01:19:36 2012 +0100
+++ b/tests/ChangeLog Mon Dec 24 01:07:25 2012 +0900
＠＠ -14,15 +14,15 ＠＠
Make sure we can search for character ranges successfully when the
syntax table is dirty.
-2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
-
- * XEmacs 21.5.32 "habanero" is released.
-
2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
+2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.32 "habanero" is released.
+
2012-05-12 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el:
--
‘Liston operated so fast that he once accidentally amputated an assistant’s
fingers along with a patient’s leg, […] The patient and the assistant both
died of sepsis, and a spectator reportedly died of shock, resulting in the
only known procedure with a 300% mortality.’ (Atul Gawande, NEJM, 2012)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
4374
days inactive
4381
days old
2 comments
3 participants
participants (3)
-
Aidan Kehoe -
Stephen J. Turnbull -
The XEmacs Package Smoketest