From 00227c3952cd1618d0bd6a6a2231046b3153c14e Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 2 Jul 2004 01:14:07 +0000 Subject: - Several Fixes from Joe Green : + Another sed \t\r problem, in Makefile.in + Bad error message on "quilt delete" of non-existent patch + "import" doesn't remove all leading components on patch file + Misspelling in "import" help text - With using the GNU diff --label option, file timestamps disappeared. Specify the timestamps in --label by hand: This gives us added flexibility when generating patches; we may some day want to support diff styles other than unified. Also reported by Joe Green. - Add --backup option to quilt refresh. - Update documentation to QUILT_${COMMAND}_ARGS in .quiltrc. (The old settings still work but they are no longer documented.) - Update German translation. --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 2de99d3..d5838b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,7 +81,7 @@ DOC := $(DOC_IN) SRC += $(DOC_SRC) SRC += doc/main.tex doc/quilt.pdf doc/Makefile \ doc/sample.quiltrc doc/quilt.1.in -DIRT += $(DOC_IN:%=doc/%) +DIRT += $(DOC_IN:%=doc/%) doc/quilt.1 MAN1 := bin/guards.1 doc/quilt.1 @@ -141,8 +141,8 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) echo ; \ (bash -c ". scripts/patchfns ; LC_ALL=C . $$here/$$cmd -h")| \ grep -v 'Usage: quilt' | \ - sed -e 's/^\t//' \ - -e 's/\t/\n/' | \ + sed -e $$'s/^\t//' \ + -e $$'s/\t/\\\n/' | \ sed -e 's/^\(-.*\)$$/.IP " \1" 8/';\ echo; \ done \ -- cgit