maint: we no longer maintain the ChangeLog.

* .gitattributes: No need to merge it.
* README-hacking: Update release instructions.
This commit is contained in:
Akim Demaille
2012-05-08 10:17:46 +02:00
parent db0054f7e6
commit e2eb03d4e9
2 changed files with 9 additions and 17 deletions

2
.gitattributes vendored
View File

@@ -1 +1 @@
ChangeLog merge=merge-changelog

View File

@@ -15,25 +15,16 @@ First, if it is a large change, you must make sure they have signed
the appropriate paperwork. Second, be sure to add their name and the appropriate paperwork. Second, be sure to add their name and
email address to THANKS. email address to THANKS.
** If a change fixes a test, mention the test in the ChangeLog entry. ** If a change fixes a test, mention the test in the log entry.
** Bug reports ** Bug reports
If somebody reports a new bug, mention his name in the ChangeLog entry If somebody reports a new bug, mention his name in the log entry
and in the test case you write. Put him into THANKS. and in the test case you write. Put him into THANKS.
The correct response to most actual bugs is to write a new test case The correct response to most actual bugs is to write a new test case
which demonstrates the bug. Then fix the bug, re-run the test suite, which demonstrates the bug. Then fix the bug, re-run the test suite,
and check everything in. and check everything in.
** You may find it useful to install the git-merge-changelog merge driver:
http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c
When following the generic installation instructions there, keep in mind that
your clone of Bison's git repository already contains appropriate
.gitattributes files, and running Bison's bootstrap script will make the
necessary changes to .git/config.
* Hacking * Hacking
@@ -169,7 +160,7 @@ The autoconf files we use are currently:
lib/m4sugar/m4sugar.m4 lib/m4sugar/m4sugar.m4
lib/m4sugar/foreach.m4 lib/m4sugar/foreach.m4
These files don't change very often in autoconf, so it should be These files don't change very often in Autoconf, so it should be
relatively straight-forward to examine the differences in order to relatively straight-forward to examine the differences in order to
decide whether to update. decide whether to update.
@@ -250,12 +241,13 @@ occurrences of PACKAGE_COPYRIGHT_YEAR in configure.ac.
The version number, *and* the date of the release (including for The version number, *and* the date of the release (including for
betas). betas).
** Update ChangeLog ** Mention the release name in a commit log
Should have an entry similar to `Version 1.49b.'. Should have an entry similar to `Version 2.3b.'.
** Tag the release ** Tag the release
Before Bison will build with the right version number, you must tag the release Before Bison will build with the right version number, you must tag
in git. Do this after all other changes. The command is similar to: the release in git. Do this after all other changes. The command is
similar to:
git tag -a v2.3b git tag -a v2.3b