avoid git-merge-changelog crash

Eric Blake <[email protected]>
Newsgroups gmane.comp.gnu.m4.patches
Message-ID <[email protected]>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bruno recently sped up git-merge-changelog for cherry-picks (thanks!).
But it still has a bug where it can generate duplicate entries from one
merge, then crashes on an assertion failure on subsequent merge[1].  Avoid
the crash by removing the duplicate entry:

[1]http://lists.gnu.org/archive/html/bug-gnulib/2009-07/msg00007.html

- --
Don't work too hard, make some time for fun as well!

Eric Blake             [email protected]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpN/pIACgkQ84KuGfSFAYDNAQCgmCmAWmnx+ACjsASWR1AMVRWr
3oIAoIvP2kPxRsLsQzlsRZU1+Ax3WQN5
=55bF
-----END PGP SIGNATURE-----

_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches
m4.patch427 (text/plain, 828 B)
From f294059b524570dfd91dff8c51632b0b20a4fede Mon Sep 17 00:00:00 2001
From: Eric Blake <[email protected]>
Date: Thu, 2 Jul 2009 20:48:57 -0600
Subject: [PATCH] Remove redundant ChangeLog entry.

Signed-off-by: Eric Blake <[email protected]>
---
 ChangeLog |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a8a7c3..2a765b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -448,14 +448,6 @@

 2008-07-17  Eric Blake  <[email protected]>

-	Fix missing copyright notices.
-	* acinclude.m4: Add copyright license details.
-	* c-boxes.el: Likewise.
-	* checks/get-them: Likewise.
-	* checks/check-them: Likewise.
-
-2008-07-17  Eric Blake  <[email protected]>
-
 	Remove redundant examples/stackovf.sh.
 	* examples/stackovf.sh: Delete, now that checks has better
 	version.
-- 
1.6.3.3.334.g916e1
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.