- Split off strip_diffstat from header command.

- import command: compare patch headers to prevent destruction;
  add -d option to choose which header(s) to keep.

4 files changed, 103 insertions, 52 deletions

diff --git a/po/de.po b/po/de.po
index 323b07b..f954676 100644
--- a/po/de.po
+++ b/po/de.po
@@ -605,11 +605,11 @@ msgstr ""
 "--backup\n"
 "\tErzeuge eine Sicherungskopie von patch als patch~.\n"
 
-#: quilt/header.in:176
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr "Header von Patch %s ersetzt\\n"
 
-#: quilt/header.in:179
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr "Text an Header von Patch %s angefügt\\n"
 
@@ -618,6 +618,7 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei] ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -630,6 +631,10 @@ msgid ""
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
 "\n"
+"-d {o|a|n}\n"
+"\tKeep the old (o), all (a), or new (n) description. This option\n"
+"\tmust be specified if both patches include a description.\n"
+"\n"
 "-f\tOverwite/update existing patches.\n"
 msgstr ""
 "\n"
@@ -645,43 +650,51 @@ msgstr ""
 "\n"
 "-f\tÜberschreibe/aktualisiere existierende Patches.\n"
 
-#: quilt/import.in:75
+#: quilt/import.in:67
+msgid "Patch headers differ:\\n"
+msgstr ""
+
+#: quilt/import.in:70
+msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
+msgstr ""
+
+#: quilt/import.in:123
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 "Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches "
 "verwendet werden\\n"
 
-#: quilt/import.in:94
+#: quilt/import.in:143
 msgid "Patch %s is applied\\n"
 msgstr "Patch %s ist angewandt\\n"
 
-#: quilt/import.in:103
+#: quilt/import.in:152
 #, fuzzy
 msgid "Patch %s already exists in series.\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/import.in:109
+#: quilt/import.in:158
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n"
 
-#: quilt/import.in:113
+#: quilt/import.in:169
 msgid "Replacing patch %s with new version\\n"
 msgstr "Ersetze Patch %s durch neuere Version\\n"
 
-#: quilt/import.in:117
+#: quilt/import.in:173
 #, fuzzy
 msgid "Importing patch %s\\n"
 msgstr "Entferne patch %s\\n"
 
-#: quilt/import.in:119
+#: quilt/import.in:175
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Importiere Patch %s (abgelegt als %s)\\n"
 
-#: quilt/import.in:128
+#: quilt/import.in:185
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import.in:136
+#: quilt/import.in:192
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
@@ -1234,7 +1247,7 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 msgid "Patch %s does not exist\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:817
+#: quilt/scripts/patchfns.in:831
 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 "
@@ -1247,7 +1260,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:916
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/fr.po b/po/fr.po
index 5bba6d5..846e244 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -609,11 +609,11 @@ msgstr ""
 "\tCr�e une sauvegarde de la version originale du patch en tant\n"
 "\tque patch~.\n"
 
-#: quilt/header.in:176
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr "En-t�te du patch %s remplac�\\n"
 
-#: quilt/header.in:179
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr "Texte ajout� � la fin de l'en-t�te du patch %s\\n"
 
@@ -622,6 +622,7 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -634,6 +635,10 @@ msgid ""
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
 "\n"
+"-d {o|a|n}\n"
+"\tKeep the old (o), all (a), or new (n) description. This option\n"
+"\tmust be specified if both patches include a description.\n"
+"\n"
 "-f\tOverwite/update existing patches.\n"
 msgstr ""
 "\n"
@@ -651,42 +656,50 @@ msgstr ""
 "\n"
 "-f\t�crase/met � jour les patchs existants.\n"
 
-#: quilt/import.in:75
+#: quilt/import.in:67
+msgid "Patch headers differ:\\n"
+msgstr ""
+
+#: quilt/import.in:70
+msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
+msgstr ""
+
+#: quilt/import.in:123
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 "L'option � -n � ne peut �tre utilis� que lors de l'import d'un seul patch.\\n"
 
-#: quilt/import.in:94
+#: quilt/import.in:143
 msgid "Patch %s is applied\\n"
 msgstr "Le patch %s n'est pas appliqu�\\n"
 
-#: quilt/import.in:103
+#: quilt/import.in:152
 #, fuzzy
 msgid "Patch %s already exists in series.\\n"
 msgstr "Le patch %s n'est pas dans la s�rie\\n"
 
-#: quilt/import.in:109
+#: quilt/import.in:158
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n"
 
-#: quilt/import.in:113
+#: quilt/import.in:169
 msgid "Replacing patch %s with new version\\n"
 msgstr "Remplacement du patch %s avec la nouvelle version\\n"
 
-#: quilt/import.in:117
+#: quilt/import.in:173
 #, fuzzy
 msgid "Importing patch %s\\n"
 msgstr "Retrait de %s\\n"
 
-#: quilt/import.in:119
+#: quilt/import.in:175
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Import du patch %s (enregistr� dans %s)\\n"
 
-#: quilt/import.in:128
+#: quilt/import.in:185
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:136
+#: quilt/import.in:192
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de s�rie.\\n"
 
@@ -1246,7 +1259,7 @@ msgstr "La s�rie est compl�tement appliqu�e. Le dernier patch est %s.\\n"
 msgid "Patch %s does not exist\\n"
 msgstr "Le patch %s n'est pas dans la s�rie\\n"
 
-#: quilt/scripts/patchfns.in:817
+#: quilt/scripts/patchfns.in:831
 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 "
@@ -1258,7 +1271,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:902
+#: quilt/scripts/patchfns.in:916
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/ja.po b/po/ja.po
index 65d1da1..c7e4bed 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -587,11 +587,11 @@ msgstr ""
 "--backup\n"
 "\t古いバージョンのパッチのバックアップコピーを patch~として作成する。\n"
 
-#: quilt/header.in:176
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr "パッチ %s のヘッダを変更しました\\n"
 
-#: quilt/header.in:179
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr "パッチ %s のヘッダに追加しました\\n"
 
@@ -600,6 +600,7 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "使い方: quilt import [-f] [-p num] [-n パッチ] パッチファイル ...\\n"
 
 #: quilt/import.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -612,6 +613,10 @@ msgid ""
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
 "\n"
+"-d {o|a|n}\n"
+"\tKeep the old (o), all (a), or new (n) description. This option\n"
+"\tmust be specified if both patches include a description.\n"
+"\n"
 "-f\tOverwite/update existing patches.\n"
 msgstr ""
 "\n"
@@ -627,41 +632,49 @@ msgstr ""
 "\n"
 "-f\t存在するパッチの上書き、またはアップデート。\n"
 
-#: quilt/import.in:75
+#: quilt/import.in:67
+msgid "Patch headers differ:\\n"
+msgstr ""
+
+#: quilt/import.in:70
+msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
+msgstr ""
+
+#: quilt/import.in:123
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr "オプション \\`-n'は、パッチを一つだけ取り込むときのみ有効です。\\n"
 
-#: quilt/import.in:94
+#: quilt/import.in:143
 msgid "Patch %s is applied\\n"
 msgstr "パッチ %s は、すでに適用されています\\n"
 
-#: quilt/import.in:103
+#: quilt/import.in:152
 #, fuzzy
 msgid "Patch %s already exists in series.\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/import.in:109
+#: quilt/import.in:158
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます。\\n"
 
-#: quilt/import.in:113
+#: quilt/import.in:169
 msgid "Replacing patch %s with new version\\n"
 msgstr "パッチ %s を新しいバージョンに置き換えます\\n"
 
-#: quilt/import.in:117
+#: quilt/import.in:173
 #, fuzzy
 msgid "Importing patch %s\\n"
 msgstr "パッチ %s をはずします\\n"
 
-#: quilt/import.in:119
+#: quilt/import.in:175
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n"
 
-#: quilt/import.in:128
+#: quilt/import.in:185
 msgid "Failed to import patch %s\\n"
 msgstr "パッチ %s の取り込みに失敗しました\\n"
 
-#: quilt/import.in:136
+#: quilt/import.in:192
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
@@ -1210,7 +1223,7 @@ msgstr ""
 msgid "Patch %s does not exist\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/scripts/patchfns.in:817
+#: quilt/scripts/patchfns.in:831
 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 "
@@ -1222,7 +1235,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:916
 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 a29a82a..ea748cf 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -397,11 +397,11 @@ msgid ""
 "\tCreate a backup copy of the old version of a patch as patch~.\n"
 msgstr ""
 
-#: quilt/header.in:176
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr ""
 
-#: quilt/header.in:179
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr ""
 
@@ -422,42 +422,54 @@ msgid ""
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
 "\n"
+"-d {o|a|n}\n"
+"\tKeep the old (o), all (a), or new (n) description. This option\n"
+"\tmust be specified if both patches include a description.\n"
+"\n"
 "-f\tOverwite/update existing patches.\n"
 msgstr ""
 
-#: quilt/import.in:75
+#: quilt/import.in:67
+msgid "Patch headers differ:\\n"
+msgstr ""
+
+#: quilt/import.in:70
+msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
+msgstr ""
+
+#: quilt/import.in:123
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 
-#: quilt/import.in:94
+#: quilt/import.in:143
 msgid "Patch %s is applied\\n"
 msgstr ""
 
-#: quilt/import.in:103
+#: quilt/import.in:152
 msgid "Patch %s already exists in series.\\n"
 msgstr ""
 
-#: quilt/import.in:109
+#: quilt/import.in:158
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr ""
 
-#: quilt/import.in:113
+#: quilt/import.in:169
 msgid "Replacing patch %s with new version\\n"
 msgstr ""
 
-#: quilt/import.in:117
+#: quilt/import.in:173
 msgid "Importing patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:119
+#: quilt/import.in:175
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr ""
 
-#: quilt/import.in:128
+#: quilt/import.in:185
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:136
+#: quilt/import.in:192
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
@@ -854,7 +866,7 @@ msgstr ""
 msgid "Patch %s does not exist\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:817
+#: quilt/scripts/patchfns.in:831
 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 "
@@ -862,7 +874,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:902
+#: quilt/scripts/patchfns.in:916
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"