On Tue, 4 Aug 2009, Jim Meyering wrote: > > From f7aecbdf27eea1a0a6eb0960dbb34627ff56ccb6 Mon Sep 17 00:00:00 2001 > > From: Joel E. Denny <jde...@clemson.edu> > > Date: Tue, 4 Aug 2009 09:37:54 -0400 > > Subject: [PATCH] update-copyright-tests: correctly test EOL=\r\n handling > > > > * tests/test-update-copyright.sh: Add back the \r on each line, > > and add a comment saying it shouldn't be removed. > > Thanks, but I couldn't easily apply that, using git-am:
> and besides, mixing line endings in version-controlled > files is not sustainable, since some editors tend to > correct such anomalies. Ok. > So how about this instead? That works for me. > [BTW, it'd be good to use a "compare" function as defined in > test-vc-list-files-cvs.sh, in case diff is not available or > does not honor the -u option. ] Ok. Also in test-update-copyright.sh, I'm invoking perl to avoid using "date +%C%y" because the Autoconf manual says the latter is not portable. Is there a better way? update-copyright already invokes perl, so I figured it didn't matter. > TMP=$TMP_BASE-dos-eol > -cat > $TMP <<EOF > -Rem \r\n on each line is intentional; don't change--> That comment is redundant now. > -Rem Copyright (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997, > -Rem 98, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, > +tr @ '\r' > $TMP <<EOF > +Rem \r\n on each line is intentional; don't change-->@ > +Rem Copyright (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,@ > +Rem 98, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,@ > Rem 2009 Free Software Foundation, Inc. That last line needs the @ too. Are you working on patches for all of this? If not, let me know, and I'll get to it soon. Thanks.
