diff options
| -rw-r--r-- | po/fr.po | 3 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/refresh.in | 2 | ||||
| -rw-r--r-- | scripts/patchfns.in | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -863,7 +863,8 @@ msgstr "Le fichier %s existe\\n" #: ../quilt/setup.in:118 msgid "The %%prep section of %s failed; results may be incomplete\\n" -msgstr "La section %%prep de %s a échoué ; les résultats sont peut-être incomplets\\n" +msgstr "" +"La section %%prep de %s a échoué ; les résultats sont peut-être incomplets\\n" #: ../quilt/setup.in:121 msgid "The -v option will show rpm's output\\n" diff --git a/quilt.changes b/quilt.changes index fc14352..7ad3501 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 25 13:40:39 CEST 2004 - agruen@suse.de + +- Refresh command: recognize and ignore header lines generated by + ``cvs diff''. +- Add a missing print_patch call (cosmetic). + +------------------------------------------------------------------- Sat Aug 14 18:26:24 CEST 2004 - agruen@suse.de - Add Japanese translation from diff --git a/quilt/refresh.in b/quilt/refresh.in index 21f575f..5fbc2df 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -246,7 +246,7 @@ cat $tmp_patch >> $tmp_result if [ -e $patch_file ] && \ @DIFF@ -q $patch_file $tmp_result > /dev/null then - printf $"Patch %s is unchanged\n" "$patch" + printf $"Patch %s is unchanged\n" "$(print_patch $patch)" exit 0 fi diff --git a/scripts/patchfns.in b/scripts/patchfns.in index f1ee98f..36f3d4f 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -597,7 +597,7 @@ patch_description() then @AWK@ ' $1 == "***" || $1 == "---" { exit } - /^Index:[ \t]|^diff[ \t]|^==*$/ \ + /^Index:[ \t]|^diff[ \t]|^==*$|^RCS file: |^retrieving revision [0-9]+(\.[0-9]+)*$/ \ { eat = eat $0 "\n" next } { print eat $0 |