Paul Eggert wrote: > On 07/26/2012 01:49 PM, Eric Blake wrote: >> can we always count on the vc-dwim boilerplate to >> be the same to automatically prune it from gitlog-to-changelog? > > Probably not, but we can keep a catalog of all of them, > surely, assuming this problem persists indefinitely, > which I hope it doesn't.
How about just not writing the boilerplate text to ChangeLog when that file already exists? Then, if you've created a ChangeLog file to be used by vc-dwim, bootstrap will never touch it. (BTW, the second sentence seems incorrect: I saw no makefile rule for "ChangeLog" in tar.) diff --git a/bootstrap.conf b/bootstrap.conf index 6255ba9..e0bca02 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -68,7 +68,7 @@ fi test -d m4 || mkdir m4 test -d $source_base || mkdir $source_base -cat > ChangeLog <<EOT +test -f ChangeLog || cat > ChangeLog <<EOT This file is a placeholder. It will be replaced with the actual ChangeLog by make dist. Run make ChangeLog if you wish to create it earlier. EOT