On Thursday 26 January 2006 18:44, Gary V. Vaughan wrote: > Tag Andreas,
Hi Gary, > Latest CVS HEAD now works on darwin provided I have installed GNU awk, > and GNU coreutils (for cp and date). However, I get a spurious test > failure in import.test because the BSD diff output format differs from > the GNU diff output format with "diff -U 1024" as invoked at line 63 > of quilt/import.in. This should fix it, right? Andreas
Index: quilt.changes =================================================================== RCS file: /sources/quilt/quilt/quilt.changes,v retrieving revision 1.372 diff -u -r1.372 quilt.changes --- quilt.changes 26 Jan 2006 12:52:35 -0000 1.372 +++ quilt.changes 26 Jan 2006 19:11:29 -0000 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 26 20:08:21 CET 2006 - [EMAIL PROTECTED] + +- quilt/import.in: Add missing quoting, stop using diff -U for + portability. + +------------------------------------------------------------------- Thu Jan 26 13:49:53 CET 2006 - [EMAIL PROTECTED] - aclocal.m4(QUILT_COMPAT_PROG_PATH): Create missing compat Index: quilt/import.in =================================================================== RCS file: /sources/quilt/quilt/quilt/import.in,v retrieving revision 1.32 diff -u -r1.32 import.in --- quilt/import.in 26 Jan 2006 11:02:30 -0000 1.32 +++ quilt/import.in 26 Jan 2006 19:11:29 -0000 @@ -60,8 +60,8 @@ if [ -z "$opt_desc" ] then - local diff=$(diff -U 1024 <(echo "$old_desc") \ - <(echo "$new_desc") \ + local diff=$(diff -u <(echo "$old_desc") \ + <(echo "$new_desc") \ | sed -e '1,2d') if [ -n "$diff" ] then @@ -74,9 +74,9 @@ fi fi - [ $opt_desc = n ] || echo "$old_desc" - [ $opt_desc = a ] && echo '---' - if [ $opt_desc = o ] + [ "$opt_desc" = n ] || echo "$old_desc" + [ "$opt_desc" = a ] && echo '---' + if [ "$opt_desc" = o ] then cat "$new" | patch_body else
_______________________________________________ Quilt-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/quilt-dev
