The presence of those variables was causing annoying merge conflicts with long-lived and often-rebased personal branches of mine.
It is worth noting that this change, simple as it is, might still be seen as somewhat controversial. As highlighted in this older thread: http://lists.gnu.org/archive/html/automake-patches/2012-02/msg00037.html it is true that keeping explicit '$scriptversion' definitions has some advantages, and that a more "correct and complete" solution of my issue would involve writing a new git merge driver able to automatically handle conflicts in '$scriptversion' definitions. But I have no inclination of writing and maintaining such a driver myself, and I (selfishly?) believe that my personal convenience outweighs the advantages described in that thread. So I'm proceeding with this change. I might still revert it at a later date, if the outcry against it is loud enough *and* if someone is ready to write a proper git merge driver. * lib/ar-lib: Remove '$scriptversion' definition, and associated Emacs "local variables". * lib/compile: Likewise. * lib/config.guess: Likewise. * lib/config.sub: Likewise. * lib/depcomp: Likewise. * lib/gendocs.sh: Likewise. * lib/gitlog-to-changelog: Likewise. * lib/gnupload: Likewise. * lib/install-sh: Likewise. * lib/mdate-sh: Likewise. * lib/missing: Likewise. * lib/mkinstalldirs: Likewise. * lib/py-compile: Likewise. * lib/tap-driver.pl: Likewise. * lib/tap-driver.sh: Likewise. * lib/test-driver: Likewise. * lib/update-copyright: Likewise. * lib/ylwrap: Likewise. Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- lib/ar-lib | 2 -- lib/compile | 7 ------- lib/config.guess | 4 ---- lib/config.sub | 4 ---- lib/depcomp | 7 ------- lib/gendocs.sh | 6 ------ lib/gitlog-to-changelog | 5 ----- lib/gnupload | 7 ------- lib/install-sh | 7 ------- lib/mdate-sh | 7 ------- lib/missing | 7 ------- lib/mkinstalldirs | 7 ------- lib/py-compile | 7 ------- lib/tap-driver.pl | 5 ----- lib/tap-driver.sh | 7 ------- lib/test-driver | 7 ------- lib/update-copyright | 5 ----- lib/ylwrap | 7 ------- 18 files changed, 108 deletions(-) diff --git a/lib/ar-lib b/lib/ar-lib index 67f5f36..7f0fe82 100755 --- a/lib/ar-lib +++ b/lib/ar-lib @@ -2,8 +2,6 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC - # Copyright (C) 2010-2012 Free Software Foundation, Inc. # Written by Peter Rosin <p...@lysator.liu.se>. # diff --git a/lib/compile b/lib/compile index 718dc6d..c86aa35 100755 --- a/lib/compile +++ b/lib/compile @@ -1,8 +1,6 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC - # Copyright (C) 1999-2012 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # @@ -339,9 +337,4 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/config.guess b/lib/config.guess index 872b96a..42daf09 100755 --- a/lib/config.guess +++ b/lib/config.guess @@ -1530,8 +1530,4 @@ EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" # End: diff --git a/lib/config.sub b/lib/config.sub index 8df5511..2bdc9a0 100755 --- a/lib/config.sub +++ b/lib/config.sub @@ -1786,8 +1786,4 @@ echo $basic_machine$os exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" # End: diff --git a/lib/depcomp b/lib/depcomp index 3f02f5d..50d71cc 100755 --- a/lib/depcomp +++ b/lib/depcomp @@ -1,8 +1,6 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-10-18.11; # UTC - # Copyright (C) 1999-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -782,9 +780,4 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/gendocs.sh b/lib/gendocs.sh index 0c0bc4b..ba728cb 100755 --- a/lib/gendocs.sh +++ b/lib/gendocs.sh @@ -2,8 +2,6 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2012-10-27.11 - # Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # @@ -427,8 +425,4 @@ $GENDOCS_TEMPLATE_DIR/gendocs_template >"$outdir/index.html" echo "Done, see $outdir/ subdirectory for new files." # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" # End: diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog index 5184edc..3a67337 100755 --- a/lib/gitlog-to-changelog +++ b/lib/gitlog-to-changelog @@ -424,9 +424,4 @@ sub git_dir_option($) # Local Variables: # mode: perl # indent-tabs-mode: nil -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "my $VERSION = '" -# time-stamp-format: "%:y-%02m-%02d %02H:%02M" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "'; # UTC" # End: diff --git a/lib/gnupload b/lib/gnupload index f6b999b..4e1c31a 100755 --- a/lib/gnupload +++ b/lib/gnupload @@ -1,8 +1,6 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2012-12-11.16; # UTC - # Copyright (C) 2004-2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -425,9 +423,4 @@ done exit 0 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/install-sh b/lib/install-sh index 377bb86..87e9ce4 100755 --- a/lib/install-sh +++ b/lib/install-sh @@ -1,8 +1,6 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC - # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -519,9 +517,4 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/mdate-sh b/lib/mdate-sh index 4614441..7529ccf 100755 --- a/lib/mdate-sh +++ b/lib/mdate-sh @@ -1,8 +1,6 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2010-08-21.06; # UTC - # Copyright (C) 1995-2012 Free Software Foundation, Inc. # written by Ulrich Drepper <drep...@gnu.ai.mit.edu>, June 1995 # @@ -216,9 +214,4 @@ echo $day $month $year # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/missing b/lib/missing index ed429b4..5ef50eb 100755 --- a/lib/missing +++ b/lib/missing @@ -1,8 +1,6 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC - # Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. @@ -207,9 +205,4 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs index 55d537f..6be046f 100755 --- a/lib/mkinstalldirs +++ b/lib/mkinstalldirs @@ -1,8 +1,6 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2009-04-28.21; # UTC - # Original author: Noah Friedman <fried...@prep.ai.mit.edu> # Created: 1993-05-16 # Public domain. @@ -154,9 +152,4 @@ exit $errstatus # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/py-compile b/lib/py-compile index 14d0d12..658c528 100755 --- a/lib/py-compile +++ b/lib/py-compile @@ -1,8 +1,6 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2011-06-08.12; # UTC - # Copyright (C) 2000-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -162,9 +160,4 @@ sys.stdout.write('\n')" 2>/dev/null || : # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/tap-driver.pl b/lib/tap-driver.pl index 7f420af..424d6f9 100755 --- a/lib/tap-driver.pl +++ b/lib/tap-driver.pl @@ -556,9 +556,4 @@ main @ARGV; # cperl-extra-newline-before-brace: t # cperl-merge-trailing-else: nil # cperl-continued-statement-offset: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "my $VERSION = " -# time-stamp-format: "'%:y-%02m-%02d.%02H'" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh index 259ca0d..a013ecb 100755 --- a/lib/tap-driver.sh +++ b/lib/tap-driver.sh @@ -23,8 +23,6 @@ # bugs to <bug-autom...@gnu.org> or send patches to # <automake-patches@gnu.org>. -scriptversion=2011-12-27.17; # UTC - # Make unconditional expansion of undefined variables an error. This # helps a lot in preventing typo-related bugs. set -u @@ -644,9 +642,4 @@ test $? -eq 0 || fatal "I/O or internal error" # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/test-driver b/lib/test-driver index 53e19b8..9474b9e 100755 --- a/lib/test-driver +++ b/lib/test-driver @@ -1,8 +1,6 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC - # Copyright (C) 2011-2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -119,9 +117,4 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: diff --git a/lib/update-copyright b/lib/update-copyright index 082b749..788ad6c 100755 --- a/lib/update-copyright +++ b/lib/update-copyright @@ -266,9 +266,4 @@ else # Local variables: # mode: perl # indent-tabs-mode: nil -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "my $VERSION = '" -# time-stamp-format: "%:y-%02m-%02d.%02H:%02M" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "'; # UTC" # End: diff --git a/lib/ylwrap b/lib/ylwrap index b5c673d..b5778fb 100755 --- a/lib/ylwrap +++ b/lib/ylwrap @@ -1,8 +1,6 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2012-12-21.17; # UTC - # Copyright (C) 1996-2012 Free Software Foundation, Inc. # # Written by Tom Tromey <tro...@cygnus.com>. @@ -241,9 +239,4 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" # End: -- 1.8.0.1.409.g252f922
