diff options
| -rw-r--r-- | po/de.po | 15 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 4 | ||||
| -rw-r--r-- | po/quilt.pot | 4 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 18 |
6 files changed, 24 insertions, 27 deletions
@@ -695,11 +695,11 @@ msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" #: quilt/mail.in:24 msgid "" -"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] " -"[--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" +"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--" +"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" msgstr "" -"Verwendung: quilt mail {--mbox datei|--send} [--sender ...] [--from ...] " -"[--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" +"Verwendung: quilt mail {--mbox datei|--send} [--sender ...] [--from ...] [--" +"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" #: quilt/mail.in:27 msgid "" @@ -753,7 +753,8 @@ msgstr "" #: quilt/mail.in:145 msgid "Could not determine the envelope sender address. Please use --sender." -msgstr "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." +msgstr "" +"Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." #: quilt/new.in:22 msgid "Usage: quilt new {patchname}\\n" @@ -1232,7 +1233,7 @@ msgstr "Datei %s ist verschwunden\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Konnte %s nicht auf %s umbenennen: %s\n" -#: quilt/scripts/patchfns.in:703 +#: quilt/scripts/patchfns.in:693 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1245,7 +1246,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:788 +#: quilt/scripts/patchfns.in:778 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1245,7 +1245,7 @@ msgstr "Le fichier %s a disparu !\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Impossible de renommer %s en %s : %s\n" -#: quilt/scripts/patchfns.in:703 +#: quilt/scripts/patchfns.in:693 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1257,7 +1257,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:788 +#: quilt/scripts/patchfns.in:778 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1209,7 +1209,7 @@ msgstr "ファイル %s ãŒæ¶ˆãˆã¾ã—ãŸ!\n" msgid "Failed to rename %s to %s: %s\n" msgstr "パッム%s ã‹ã‚‰ %sã¸ã®åå‰ã®å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: quilt/scripts/patchfns.in:703 +#: quilt/scripts/patchfns.in:693 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1221,7 +1221,7 @@ msgstr "" "ã¦ã„ã¾ã›ã‚“。ダウングレードã™ã‚‹å‰ã«ã€pushã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® quiltを使ã£ã¦ã€\n" "ã™ã¹ã¦ã®ãƒ‘ッãƒã‚’ pop ã—ã¦ãã ã•ã„。\\n" -#: quilt/scripts/patchfns.in:788 +#: quilt/scripts/patchfns.in:778 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index a007638..72dc557 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -858,7 +858,7 @@ msgstr "" msgid "Failed to rename %s to %s: %s\n" msgstr "" -#: quilt/scripts/patchfns.in:703 +#: quilt/scripts/patchfns.in:693 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -866,7 +866,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:788 +#: quilt/scripts/patchfns.in:778 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/quilt.changes b/quilt.changes index c14f2db..9931d44 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 16 21:45:53 CET 2006 - agruen@suse.de + +- Change the rules for splitting a patch into header and body so + that it will work for git extanded patches as well. + +------------------------------------------------------------------- Sun Jan 15 16:00:17 CET 2006 - agruen@suse.de - John Vandenberg <jayvdb@gmail.com>: Make check depends on diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index bf8b71c..12100c8 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -615,28 +615,18 @@ cat_to_new_file() patch_header() { awk ' - ($1 == "***" || $1 == "---") && NF > 1 \ + /^(---|\*\*\*|Index:)[ \t][^ \t]|^diff -/ \ { exit } - /^Index:[ \t]|^diff[ \t]|^==*$|^RCS file: |^retrieving revision [0-9]+(\.[0-9]+)*$/ \ - { eat = eat $0 "\n" - next } - { print eat $0 - eat = "" } + { print } ' } patch_body() { awk ' - /^Index:[ \t]|^diff[ \t]|^==*$|^RCS file: |^retrieving revision [0-9]+(\.[0-9]+)*$/ \ - { eat = eat $0 "\n" - next } - ($1 == "***" || $1 == "---") && NF > 1 \ + !body && /^(---|\*\*\*|Index:)[ \t][^ \t]|^diff -/ \ { body=1 } - body { print eat $0 - eat = "" - next } - { eat = "" } + body { print } ' } |