[Quilt-dev] Re: Quilt and hard links

Fri, 20 Oct 2006 11:48:16 -0700 

Hello,

[CC'ing the quilt-dev list.]

On Thursday 19 October 2006 23:57, Marius Schamschula wrote:
> Andreas,
>
> I just tried to configure Quilt 0.46. I found that the script looks
> for cp -l, which is a GNU extension not found on *BSD systems.

Quilt relies on a number of GNU extensions. The instance of `cp -l' in 
quilt/scripts/patchfns.in:apply_patch_temporarily() can easily be replaced 
with a call to the backup-files utility, but I guess there will be a number 
number of other places that use GNU extensions, failures in the test suite, 
etc.

> Given 
> that I'm building under Darwin, a.k.a Mac OS X, I have two choices:
>
> 1) install an incompatible set of GNU filesystem tools that don't
> know anything about extended file attributes, and risk serious
> problems (I'm talking from experience, I've been down this road before).

Which problems did you run into because of that?

> or
>
> 2) give up.
>
> I like neither choice!
>
> Any ideas?

Choice three would be to install GNU coreutils into a separate path and make 
quilt use them by adding that directory to PATH in bin/quilt.in (and 
configuring quilt with those utilities in the PATH before the MacOS 
versions!).

Thanks,
Andreas

Index: po/de.po
===================================================================
RCS file: /sources/quilt/quilt/po/de.po,v
retrieving revision 1.134
diff -u -r1.134 de.po
--- po/de.po	9 Oct 2006 15:03:20 -0000	1.134
+++ po/de.po	20 Oct 2006 08:59:15 -0000
@@ -309,40 +309,32 @@
 "--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n"
 "\tReihenfolge zu erhalten.\n"
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Die Optionen \\`--combine', \\`--snapshot', und \\`-z' können nicht "
 "kombiniert werden.\\n"
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden."
 "\\n"
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr "Konnte temporäre Dateien nicht patchen\\n"
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr "Datei %s wird nicht verändert.\\n"
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n"
 
@@ -460,15 +452,15 @@
 "die\n"
 "Nummer erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n"
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Fehler beim Aufspalten von %s auf %s\\n"
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Neue Version von %s erstellt als %s\\n"
 
@@ -706,7 +698,7 @@
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
@@ -836,11 +828,11 @@
 "im vorgesehenen Wurzelverzeichnis, falls Quilt ein Verzeichnis zu weit oben\n"
 "im Verzeichnisbaum verwendet.\n"
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr "Patch %s existiert bereits\\n"
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr "Konnte Patch %s nicht erzeugen\\n"
 
@@ -927,6 +919,14 @@
 "\n"
 "-v\tViele Meldungen ausgeben.\n"
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:861
+msgid "Failed to copy files to temporary directory\\n"
+msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:884
+msgid "Failed to patch temporary files\\n"
+msgstr "Konnte temporäre Dateien nicht patchen\\n"
+
 #: quilt/pop.in:140
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
@@ -1068,16 +1068,18 @@
 msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
 #: quilt/refresh.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
 "Verwendung: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
 "timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
 "whitespace] [patch]\\n"
 
 #: quilt/refresh.in:26
+#, fuzzy
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -1103,6 +1105,11 @@
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -1174,35 +1181,39 @@
 "--strip-trailing-whitespace\n"
 "\tEntferne Whitespace an Zeilenenden.\n"
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr ""
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -"
 "p1 angeben\\n"
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Später angewandte Patches verändern Dateien von %s. Auffrischen mit -f "
 "erzwingen.\\n"
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "Kann --strip-trailing-whitespace nicht für Patches verwenden, die Dateien "
 "enthalten, die danach von anderen Patches weiter verändert werden.\\n"
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr "Patch %s ist leer\\n"
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s ist unverändert\\n"
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s aufgefrischt\\n"
 
@@ -1280,21 +1291,6 @@
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Zustelladresse `%s' ist ungültig\n"
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "Verwendung: %s {-s|-u} abschnitt datei [< ersetzung]\n"
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Datei %s ist verschwunden\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "Keine Patches in der series-Datei\\n"
@@ -1315,7 +1311,7 @@
 msgid "Patch %s does not exist\\n"
 msgstr "Patch %s existiert nicht\\n"
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:917
 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 "
@@ -1328,7 +1324,7 @@
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:942
+#: quilt/scripts/patchfns.in:1002
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1543,3 +1539,12 @@
 "Bitte entfernen Sie alle Patches mit \\`quilt pop -a' der quilt-Version, die "
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
+
+#~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+#~ msgstr "Verwendung: %s {-s|-u} abschnitt datei [< ersetzung]\n"
+
+#~ msgid "File %s disappeared!\n"
+#~ msgstr "Datei %s ist verschwunden\n"
+
+#~ msgid "Failed to rename %s to %s: %s\n"
+#~ msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
Index: po/fr.po
===================================================================
RCS file: /sources/quilt/quilt/po/fr.po,v
retrieving revision 1.147
diff -u -r1.147 fr.po
--- po/fr.po	9 Oct 2006 15:03:20 -0000	1.147
+++ po/fr.po	20 Oct 2006 08:59:15 -0000
@@ -311,40 +311,32 @@
 "--sort\tTrie les fichiers par leur nom au lieu de préserver leur ordre\n"
 "\td'origine.\n"
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées."
 "\\n"
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de créer des patches avec -p%s. Veuillez spécifier -p0 ou -p1 à "
 "la place\\n"
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Le patch %s n'est pas appliqué avant %s\\n."
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n"
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr "Impossible de patcher les fichiers temporaires\\n"
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr "Le fichier %s n'est pas modifié.\\n"
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "Le diff a échoué. Abandon.\\n"
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "Attention: un patch plus recent modifie des fichiers communs à %s\\n"
 
@@ -463,15 +455,15 @@
 "tiret suivi d'un nombre, ce nombre est augmenté à la place (par\n"
 "exemple : patch.diff, patch-2.diff, patch-3.diff).\n"
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "Le patch %s existe déjà, veuillez choisir un nouveau nom\\n"
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Le fork de %s en %s a échoué\\n"
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Le fork de %s a été créé en tant que %s\\n"
 
@@ -709,7 +701,7 @@
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de série.\\n"
 
@@ -842,11 +834,11 @@
 "répertoire devant être la racine si quilt choisi un répertoire trop haut\n"
 "dans l'arborescence.\n"
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr "Le patch %s existe déjà\\n"
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr "Impossible de créer le patch %s\\n"
 
@@ -939,6 +931,14 @@
 "\n"
 "-v\tOpère verbeusement.\n"
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:861
+msgid "Failed to copy files to temporary directory\\n"
+msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n"
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:884
+msgid "Failed to patch temporary files\\n"
+msgstr "Impossible de patcher les fichiers temporaires\\n"
+
 #: quilt/pop.in:140
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
@@ -1088,16 +1088,18 @@
 msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
 
 #: quilt/refresh.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
 "Usage : quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
 "timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
 "whitespace] [patch]\\n"
 
 #: quilt/refresh.in:26
+#, fuzzy
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -1123,6 +1125,11 @@
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -1190,35 +1197,39 @@
 "--strip-trailing-whitespace\n"
 "\tSupprime les espaces à la fin des lignes.\n"
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr ""
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de rafraîchir des patchs avec -p%s. Veuillez spécifier -p0 ou -p1 "
 "à la place.\\n"
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Des fichiers plus récents modifient les mêmes fichiers que %s.\n"
 "Forcez le rafraîchissement avec -f.\\n"
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n"
 "certains fichiers sont masqués.\\n"
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr "Le patch %s ne contient rien\\n"
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s inchangé\\n"
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s rafraîchi\\n"
 
@@ -1295,21 +1306,6 @@
 msgid "Delivery address `%s' is invalid\n"
 msgstr "L'adresse de destination `%s' est invalide\n"
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Le fichier %s a disparu !\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Impossible de renommer %s en %s : %s\n"
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "Aucun patch dans la série\\n"
@@ -1330,7 +1326,7 @@
 msgid "Patch %s does not exist\\n"
 msgstr "Le patch %s n'existe pas\\n"
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:917
 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 "
@@ -1342,7 +1338,7 @@
 "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:942
+#: quilt/scripts/patchfns.in:1002
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1557,3 +1553,12 @@
 "Veuillez retirer tous les patchs en utilisant « quilt pop -a » avec la \n"
 "version utilisée pour créer cet arbre de travail, ou effacez le répertoire\n"
 "%s et réappliquez complètement vos patchs.\\n"
+
+#~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+#~ msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
+
+#~ msgid "File %s disappeared!\n"
+#~ 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"
Index: po/ja.po
===================================================================
RCS file: /sources/quilt/quilt/po/ja.po,v
retrieving revision 1.104
diff -u -r1.104 ja.po
--- po/ja.po	9 Oct 2006 15:03:20 -0000	1.104
+++ po/ja.po	20 Oct 2006 08:59:15 -0000
@@ -302,37 +302,29 @@
 "\n"
 "--sort\t順番を保持せず、名前順にファイルを並び換える。\n"
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n"
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n"
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr "ファイル %s は変更されていません\\n"
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "差分に失敗しました。異常終了します\\n"
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n"
 
@@ -444,15 +436,15 @@
 "\\`-2' が付く。すでにパッチ名が -番号で終っている場合、番号の値が1増える "
 "(例: patch.diff、patch-2.diff、patch-3.diff)。\n"
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n"
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n"
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr "パッチ %s の分岐で %s が作成されました\\n"
 
@@ -683,7 +675,7 @@
 msgid "Failed to import patch %s\\n"
 msgstr "パッチ %s の取り込みに失敗しました\\n"
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
@@ -812,11 +804,11 @@
 "たディレクトリより上のディレクトリを Quilt が間違って選んでしまった場\n"
 "合は、正しい場所に %s ディレクトリを作成すること。\n"
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr "パッチ %s は、すでに存在します\\n"
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
 
@@ -904,6 +896,14 @@
 "\n"
 "-v\t詳細に表示。\n"
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:861
+msgid "Failed to copy files to temporary directory\\n"
+msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:884
+msgid "Failed to patch temporary files\\n"
+msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
+
 #: quilt/pop.in:140
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
@@ -1048,16 +1048,18 @@
 msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
 
 #: quilt/refresh.in:22
+#, fuzzy
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
 "使い方: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
 "timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
 "whitespace] [パッチ]\\n"
 
 #: quilt/refresh.in:26
+#, fuzzy
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -1083,6 +1085,11 @@
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -1147,33 +1154,37 @@
 "--strip-trailing-whitespace\n"
 "\t末尾の空白文字を削除する。\n"
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr ""
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください\\n"
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実"
 "行する場合は -f オプションを使用してください。\\n"
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "--strip-trailing-whitespace は影になっているファイルがある場合は使えません"
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr "パッチ %s にはなにも含まれていません\\n"
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr "パッチ %s に変更はありません\\n"
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
@@ -1249,21 +1260,6 @@
 msgid "Delivery address `%s' is invalid\n"
 msgstr "配送先のアドレス `%s' が不正です\n"
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "使いかた: %s {-s|-u} section file [< replacement]\n"
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "ファイル %s が消えました!\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "シリーズに登録されているパッチがありません\\n"
@@ -1285,7 +1281,7 @@
 msgid "Patch %s does not exist\\n"
 msgstr "パッチ %s が存在しません\\n"
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:917
 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 "
@@ -1297,7 +1293,7 @@
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:942
+#: quilt/scripts/patchfns.in:1002
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1510,3 +1506,12 @@
 "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n"
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
+
+#~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+#~ msgstr "使いかた: %s {-s|-u} section file [< replacement]\n"
+
+#~ msgid "File %s disappeared!\n"
+#~ msgstr "ファイル %s が消えました!\n"
+
+#~ msgid "Failed to rename %s to %s: %s\n"
+#~ msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
Index: po/quilt.pot
===================================================================
RCS file: /sources/quilt/quilt/po/quilt.pot,v
retrieving revision 1.127
diff -u -r1.127 quilt.pot
--- po/quilt.pot	9 Oct 2006 15:03:20 -0000	1.127
+++ po/quilt.pot	20 Oct 2006 08:59:15 -0000
@@ -197,36 +197,28 @@
 "--sort\tSort files by their name instead of preserving the original order.\n"
 msgstr ""
 
-#: quilt/diff.in:217
+#: quilt/diff.in:218
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 
-#: quilt/diff.in:231
+#: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: quilt/diff.in:265 quilt/files.in:105
+#: quilt/diff.in:266 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr ""
 
-#: quilt/diff.in:315 quilt/pop.in:98
-msgid "Failed to copy files to temporary directory\\n"
-msgstr ""
-
-#: quilt/diff.in:339 quilt/pop.in:122
-msgid "Failed to patch temporary files\\n"
-msgstr ""
-
-#: quilt/diff.in:358
+#: quilt/diff.in:326
 msgid "File %s is not being modified\\n"
 msgstr ""
 
-#: quilt/diff.in:378 quilt/refresh.in:188
+#: quilt/diff.in:346 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr ""
 
-#: quilt/diff.in:385
+#: quilt/diff.in:353
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr ""
 
@@ -304,15 +296,15 @@
 "patch-2.diff, patch-3.diff).\n"
 msgstr ""
 
-#: quilt/fork.in:88
+#: quilt/fork.in:84
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr ""
 
-#: quilt/fork.in:100
+#: quilt/fork.in:96
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr ""
 
-#: quilt/fork.in:106
+#: quilt/fork.in:102 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr ""
 
@@ -469,7 +461,7 @@
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:207
+#: quilt/import.in:207 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
@@ -555,11 +547,11 @@
 "in the directory tree.\n"
 msgstr ""
 
-#: quilt/new.in:70
+#: quilt/new.in:70 quilt/refresh.in:179
 msgid "Patch %s exists already\\n"
 msgstr ""
 
-#: quilt/new.in:81
+#: quilt/new.in:81 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr ""
 
@@ -619,6 +611,14 @@
 "-v\tVerbose operation.\n"
 msgstr ""
 
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:861
+msgid "Failed to copy files to temporary directory\\n"
+msgstr ""
+
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:884
+msgid "Failed to patch temporary files\\n"
+msgstr ""
+
 #: quilt/pop.in:140
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
@@ -729,9 +729,9 @@
 
 #: quilt/refresh.in:22
 msgid ""
-"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
-"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
-"whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
 msgstr ""
 
 #: quilt/refresh.in:26
@@ -760,6 +760,11 @@
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
 "\tcontext lines defaults to 3.\n"
 "\n"
+"-z[new_name]\n"
+"\tCreate a new patch containing the changes instead of refreshing the\n"
+"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n"
+"\toriginal patch name, etc. (See the fork command.)\n"
+"\n"
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
@@ -781,29 +786,33 @@
 "\tStrip trailing whitespace at the end of lines.\n"
 msgstr ""
 
-#: quilt/refresh.in:159
+#: quilt/refresh.in:165
+msgid "Can only refresh the topmost patch with -z currently\\n"
+msgstr ""
+
+#: quilt/refresh.in:196
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: quilt/refresh.in:194
+#: quilt/refresh.in:234
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 
-#: quilt/refresh.in:200
+#: quilt/refresh.in:240
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 
-#: quilt/refresh.in:206
+#: quilt/refresh.in:246
 msgid "Nothing in patch %s\\n"
 msgstr ""
 
-#: quilt/refresh.in:284
+#: quilt/refresh.in:319
 msgid "Patch %s is unchanged\\n"
 msgstr ""
 
-#: quilt/refresh.in:290
+#: quilt/refresh.in:345
 msgid "Refreshed patch %s\\n"
 msgstr ""
 
@@ -868,21 +877,6 @@
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr ""
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr ""
-
 #: quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr ""
@@ -903,7 +897,7 @@
 msgid "Patch %s does not exist\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:857
+#: quilt/scripts/patchfns.in:917
 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 "
@@ -911,7 +905,7 @@
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:942
+#: quilt/scripts/patchfns.in:1002
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
Index: quilt/scripts/patchfns.in
===================================================================
RCS file: /sources/quilt/quilt/quilt/scripts/patchfns.in,v
retrieving revision 1.20
diff -u -r1.20 patchfns.in
--- quilt/scripts/patchfns.in	19 Oct 2006 18:49:18 -0000	1.20
+++ quilt/scripts/patchfns.in	20 Oct 2006 08:59:15 -0000
@@ -855,7 +855,8 @@
 
 	if [ [EMAIL PROTECTED] -gt 0 ] \
 	   && ! ( cd $QUILT_PC/$patch &&
-		  cp -l --parents "[EMAIL PROTECTED]" $workdir/ )
+		  printf "%s\n" "[EMAIL PROTECTED]" \
+		  | $QUILT_LIB/backup-files -s -b -B $workdir/ -f - )
 	then
 		printf $"Failed to copy files to temporary directory\n" >&2
 		return 1

_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev

Reply via email to