- Try to clean up the force-apply and interactive-apply logic

  in quilt push, and add a force option to quilt fold: Fold was
  applying patches interactively and was restoring files if there
  were rejects; this was very unexpected for users.

1 files changed, 32 insertions, 27 deletions

diff --git a/po/de.po b/po/de.po
index b734308..f302bdb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -401,6 +401,11 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-q\tQuiet operation.\n"
+"\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-p strip-level\n"
 "\tThe number of pathname components to strip from file names\n"
 "\twhen applying patchfile.\n"
@@ -411,11 +416,17 @@ msgstr ""
 "obersten Patch enthalten sind, und wendet dann den neuen Patch\n"
 "mit der angegebenen Anzahl an Strip-Ebenen an (Standardwert = 1).\n"
 "\n"
+"-q\tWenige Meldungen ausgeben.\n"
+"\n"
+"-f\tAnwenden erzwingen, selbst wenn dabei Fehler auftreten. Wenn -q nicht\n"
+"\tangegeben wird der Patch interaktiv angewandt, und das Patch-Utility\n"
+"\tkann fragen stellen.\n"
+"\n"
 "-p strip-ebenen\n"
 "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n"
 "\tentfernt werden sollen.\n"
 
-#: quilt/fold.in:112
+#: quilt/fold.in:123
 msgid "File %s may be corrupted\\n"
 msgstr "Datei %s ist möglicherweise defekt\\n"
 
@@ -960,7 +971,7 @@ msgstr "Kein Patch entfernt\\n"
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
-#: quilt/pop.in:274 quilt/push.in:373
+#: quilt/pop.in:274 quilt/push.in:369
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -980,11 +991,11 @@ msgstr ""
 
 #: quilt/push.in:24
 msgid ""
-"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|"
-"auto|never]] [num|patch]\\n"
+"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] "
+"[num|patch]\\n"
 msgstr ""
-"Verwendung: quilt push [-afqv] [--leave-rejects] [--interactive] [--color"
-"[=always|auto|never]] [num|patch]\\n"
+"Verwendung: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|"
+"never]] [num|patch]\\n"
 
 #: quilt/push.in:27
 msgid ""
@@ -998,21 +1009,17 @@ msgid ""
 "\n"
 "-a\tApply all patches in the series file.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects.\n"
-"\n"
 "-q\tQuiet operation.\n"
 "\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-v\tVerbose operation.\n"
 "\n"
 "--leave-rejects\n"
 "\tLeave around the reject files patch produced, even if the patch\n"
 "\tis not actually applied.\n"
 "\n"
-"--interactive\n"
-"\tAllow the patch utility to ask how to deal with conflicts. If\n"
-"\tthis option is not given, the -f option will be passed to the\n"
-"\tpatch program.\n"
-"\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring.\n"
 msgstr ""
@@ -1025,52 +1032,50 @@ msgstr ""
 "\n"
 "-a\tAlle folgenden Patches anwenden.\n"
 "\n"
-"-f\tAnwenden erzwingen, solbst wenn dabei Fehler (Rejects) auftreten.\n"
-"\n"
 "-q\tWenige Meldungen ausgeben.\n"
 "\n"
+"-f\tAnwenden erzwingen, selbst wenn dabei Fehler auftreten. Wenn -q nicht\n"
+"\tangegeben wird der Patch interaktiv angewandt, und das Patch-Utility\n"
+"\tkann fragen stellen.\n"
+"\n"
 "-v\tViele Meldungen ausgeben.\n"
 "\n"
 "--leave-rejects\n"
 "\tReject-Dateien (von \\`patch') bestehen lassen, selbst wenn ein Patch\n"
 "\tnicht sauber angewandt werden kann.\n"
 "\n"
-"--interactive\n"
-"\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n"
-"\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n"
-"\n"
 "--color[=always|auto|never]\n"
 "\tSyntax-Einfärbung aktivieren (immer, automatisch, nie).\n"
 
-#: quilt/push.in:64
+#: quilt/push.in:60
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
 
-#: quilt/push.in:177
+#: quilt/push.in:173
 msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
-#: quilt/push.in:211
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Patch %s scheint leer zu sein; angewandt\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n"
 
-#: quilt/push.in:229
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Patch %s kann verkehrt angewandt werden\\n"
 
-#: quilt/push.in:232
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
 
-#: quilt/push.in:353
+#: quilt/push.in:349
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n"