From: Dan Harkless Date: Fri, 21 Jul 2000 02:25:59 +0000 (+0000) Subject: Last pass at README.developers -- Kimmo's 5-step commit was overkill. You only X-Git-Tag: RELEASE_1_2~217 X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=7a39c12041b050791790cfbe33686377a98ff59e Last pass at README.developers -- Kimmo's 5-step commit was overkill. You only need 3 steps, since configure.in is the only autoconf file with the RCS $Id keyword. --- diff --git a/ChangeLog b/ChangeLog index 9850614..2e741c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Mon Jul 17 13:53:26 2000 Dan Harkless +Thu Jul 20 19:24:17 2000 Dan Harkless * Moved Kimmo's new "--with-hash-backup" to be output with the rest of the --with options in the configure --help output. Also, @@ -15,6 +15,10 @@ Mon Jul 17 13:53:26 2000 Dan Harkless it compiles, but according to Ken, the SASL stuff still does not work. Integrating a patch from him for this. + * Last pass at README.developers -- Kimmo's 5-step commit was + overkill. You only need 3 steps, since configure.in is the only + autoconf file with the RCS $Id keyword. + Tue Jul 18 19:36:59 EDT 2000 Kimmo Suominen * Added the answer to Dan's question in README.developers. diff --git a/docs/README.developers b/docs/README.developers index 522244a..9edd701 100644 --- a/docs/README.developers +++ b/docs/README.developers @@ -44,20 +44,19 @@ around with `touch'. The correct procedure to commit the configure-related files is: % cvs commit acconfig.h aclocal.m4 configure.in - % autoconf && autoheader # or simply "make" - % cvs commit config.h.in configure - % make stamp-h.in # or simply "make" - % cvs commit stamp-h.in - -The reason that the commits need to be split up is that the timestamps on the -files change when the commits are done and the RCS Ids change. If one committed -all the files in one fell swoop (in the above relative order), timestamps would -cause unnecessary autoconf regeneration on 'make's after the commit, which would -waste your time and would cause your local stamp-h.in to be out-of-sync with the -one checked into CVS (not the end of the world, but...). - -If you haven't changed all the files noted above, just commit the ones you have, -in the stated order (for instance, configure.in, then configure, then + % autoheader; autoconf; date > stamp-h.in + % cvs commit config.h.in configure stamp-h.in + +The reason for the three-step commit is that configure.in contains the RCS $Id +keyword, so when you commit it, a new version is written locally. Therefore, +the autoconf regeneration should be held off until after the commit, or your +local stamp-h.in will become out-of-sync with the CVS version (granted, not that +big a deal). For the second step, you're doing the same commands as a +`make reset' would do, but using that command would require extra configure runs +to make Makefile be up-to-date. + +If you haven't changed all the files noted above, just commit the ones you have +changed, in the stated order (for instance, configure.in, then configure and stamp-h.in).