> how will the ChangeLog file be handled after the switch to git? > Will it be maintained manually or will it be generated > automatically using the git commit messages?
I'd propose to generate it automatically using gitlog-to-changelog module from gnulib. I've been using this approach in tar, mailutils and other projects since migrating to Git and it has proved to create accurate and well-formatted ChangeLogs, provided that a due discipline is observed when creating commit messages. This approach is cumbersome. You won't be able to fix a wrong ChangeLog if it would end up in the commit log, asking for due discipline isn't the way to go, both you and I don't write perfect entries. I'm totally against any scheme where ChangeLog cannot be amended. The above approach also makes it hard to use ChangeLog mode, since you can only write the commit message at commit time (unless you jump hoops and save the entries to a file and what not). I like the scheme glibc uses, where ChangeLog is managed the way it normally is, and the git commit messages is a one line summary of the change. Here is an example (including a few fixes to some ChangeLog entries), commit 677760a3076884bd6496e3676b1102db400f79d6 Author: Ulrich Drepper <[email protected]> Date: Sun Aug 16 00:39:43 2009 -0700 Fix 64-bit platform handling in test cases for generated headers with constants. diff --git a/ChangeLog b/ChangeLog index 28a92f4..39bbb2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-16 Ulrich Drepper <[email protected]> + + * scripts/gen-as-const.awk: Fix test for 64-bit platform. + 2009-08-14 Ulrich Drepper <[email protected]> * test-skeleton.c (signal_handler): Renamed from timeout_handler. @@ -58,7 +62,7 @@ * sysdeps/x86_64/strcmp.S: Add support to compile with USE_SSSE3. In this case palignr is used. - * sysdeps/x86_64/multiarch/strcmp.S (strcmp): If SSE4.3 is not + * sysdeps/x86_64/multiarch/strcmp.S (strcmp): If SSE4.2 is not available but SSSE3 is, pick __str{,n}cmp_ssse3. * sysdeps/x86_64/multiarch/Makefile [subdir=string] (sysdep_routines): Add strcmp-ssse3 and strncmp-ssse3. @@ -1803,7 +1807,7 @@ * sysdeps/x86_64/mp_clz_tab.c: New file. 2009-03-17 Ryan S. Arnold <[email protected]> - Ulrich Drepper <[email protected]> + Ulrich Drepper <[email protected]> * sysdeps/unix/sysv/linux/fallocate.c: Handle old kernel headers. * sysdeps/unix/sysv/linux/fallocate64.c: Likewise.
