diff options
| -rw-r--r-- | po/de.po | 22 | ||||
| -rw-r--r-- | po/fr.po | 20 | ||||
| -rw-r--r-- | po/ja.po | 20 | ||||
| -rw-r--r-- | po/quilt.pot | 19 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/fold.in | 3 | ||||
| -rw-r--r-- | test/fold.test | 41 |
7 files changed, 83 insertions, 48 deletions
@@ -409,7 +409,7 @@ msgstr "" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" "\tentfernt werden sollen.\n" -#: quilt/fold.in:116 +#: quilt/fold.in:117 msgid "File %s may be corrupted\\n" msgstr "Datei %s ist möglicherweise defekt\\n" @@ -608,7 +608,8 @@ msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei] ...\\n" #: quilt/import.in:25 msgid "" "\n" -"Import external patches.\n" +"Import external patches. The patches will be inserted following the\n" +"current top patch, and must be pushed after import to apply them.\n" "\n" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" @@ -620,7 +621,8 @@ msgid "" "-f\tOverwite/update existing patches.\n" msgstr "" "\n" -"Importiere externe Patches.\n" +"Importiere externe Patches. Die Patches werden nach dem momentan obersten\n" +"Patch eingefügt, und können dann mit dem push-Befehl angewandt werden.\n" "\n" "-p num\n" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" @@ -631,33 +633,33 @@ msgstr "" "\n" "-f\tÜberschreibe/aktualisiere existierende Patches.\n" -#: quilt/import.in:74 +#: quilt/import.in:75 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:92 +#: quilt/import.in:93 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:100 +#: quilt/import.in:101 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:104 +#: quilt/import.in:105 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: quilt/import.in:107 +#: quilt/import.in:108 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:115 +#: quilt/import.in:116 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:122 +#: quilt/import.in:123 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -409,7 +409,7 @@ msgstr "" "\tNombre de niveaux de rpertoires retirer lors de l'application du \n" "\tpatch.\n" -#: quilt/fold.in:116 +#: quilt/fold.in:117 msgid "File %s may be corrupted\\n" msgstr "Le fichier %s est peut-tre corrompu\\n" @@ -609,9 +609,11 @@ 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.\n" +"Import external patches. The patches will be inserted following the\n" +"current top patch, and must be pushed after import to apply them.\n" "\n" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" @@ -635,32 +637,32 @@ msgstr "" "\n" "-f\tcrase/met jour les patchs existants.\n" -#: quilt/import.in:74 +#: quilt/import.in:75 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:92 +#: quilt/import.in:93 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: quilt/import.in:100 +#: quilt/import.in:101 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:104 +#: quilt/import.in:105 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:107 +#: quilt/import.in:108 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistr dans %s)\\n" -#: quilt/import.in:115 +#: quilt/import.in:116 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:122 +#: quilt/import.in:123 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de srie.\\n" @@ -398,7 +398,7 @@ msgstr "" "-p strip-level\n" "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n" -#: quilt/fold.in:116 +#: quilt/fold.in:117 msgid "File %s may be corrupted\\n" msgstr "ファイル %s は壊れている可能性があります\\n" @@ -589,9 +589,11 @@ 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.\n" +"Import external patches. The patches will be inserted following the\n" +"current top patch, and must be pushed after import to apply them.\n" "\n" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" @@ -614,31 +616,31 @@ msgstr "" "\n" "-f\t存在するパッチの上書き、またはアップデート。\n" -#: quilt/import.in:74 +#: quilt/import.in:75 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "オプション \\`-n'は、パッチを一つだけ取り込むときのみ有効です。\\n" -#: quilt/import.in:92 +#: quilt/import.in:93 msgid "Patch %s is applied\\n" msgstr "パッチ %s は、すでに適用されています\\n" -#: quilt/import.in:100 +#: quilt/import.in:101 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます。\\n" -#: quilt/import.in:104 +#: quilt/import.in:105 msgid "Replacing patch %s with new version\\n" msgstr "パッチ %s を新しいバージョンに置き換えます\\n" -#: quilt/import.in:107 +#: quilt/import.in:108 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n" -#: quilt/import.in:115 +#: quilt/import.in:116 msgid "Failed to import patch %s\\n" msgstr "パッチ %s の取り込みに失敗しました\\n" -#: quilt/import.in:122 +#: quilt/import.in:123 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 3b85f74..34df47c 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -283,7 +283,7 @@ msgid "" "\twhen applying patchfile.\n" msgstr "" -#: quilt/fold.in:116 +#: quilt/fold.in:117 msgid "File %s may be corrupted\\n" msgstr "" @@ -413,7 +413,8 @@ msgstr "" #: quilt/import.in:25 msgid "" "\n" -"Import external patches.\n" +"Import external patches. The patches will be inserted following the\n" +"current top patch, and must be pushed after import to apply them.\n" "\n" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" @@ -425,31 +426,31 @@ msgid "" "-f\tOverwite/update existing patches.\n" msgstr "" -#: quilt/import.in:74 +#: quilt/import.in:75 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" -#: quilt/import.in:92 +#: quilt/import.in:93 msgid "Patch %s is applied\\n" msgstr "" -#: quilt/import.in:100 +#: quilt/import.in:101 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: quilt/import.in:104 +#: quilt/import.in:105 msgid "Replacing patch %s with new version\\n" msgstr "" -#: quilt/import.in:107 +#: quilt/import.in:108 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: quilt/import.in:115 +#: quilt/import.in:116 msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:122 +#: quilt/import.in:123 msgid "Failed to insert patch %s into file series\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 6b46dc6..ada79b0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 22 23:15:18 CEST 2005 - agruen@suse.de + +- quilt/fold.in: fold did not work when invoked from a + subdirectory; update test case. + +------------------------------------------------------------------- Wed Aug 17 12:19:25 CEST 2005 - agruen@suse.de - quilt/edit.in: Check exit status after adding files. diff --git a/quilt/fold.in b/quilt/fold.in index b3e2d71..1dfa784 100644 --- a/quilt/fold.in +++ b/quilt/fold.in @@ -83,7 +83,8 @@ fi trap "failed=1" SIGINT workdir=$(gen_tempfile -d $PWD) -@PATCH@ $QUILT_PATCH_OPTS -p$opt_strip_level $silent --backup --prefix="$workdir/" -E \ +@PATCH@ -d ${SUBDIR:-.} $QUILT_PATCH_OPTS -p$opt_strip_level $silent \ + --backup --prefix="$workdir/$SUBDIR" -E \ || failed=1 if [ -z "$failed" ] diff --git a/test/fold.test b/test/fold.test index 1b26924..4c16922 100644 --- a/test/fold.test +++ b/test/fold.test @@ -4,7 +4,6 @@ $ mkdir patches $ cat > patches/series < patch1.diff - < patch2.diff $ cat > patches/patch1.diff < --- q.orig/file1.txt @@ -16,7 +15,15 @@ < @@ -0,0 +1 @@ < +This is file2.txt. - $ cat > patches/patch2.diff + $ quilt push -q + > Applying patch %{P}patch1.diff + > Now at patch %{P}patch1.diff + + $ quilt files + > file1.txt + > file2.txt + + $ quilt fold -q < --- q.orig/file2.txt < +++ q/file2.txt < @@ -1 +0,0 @@ @@ -26,15 +33,29 @@ < @@ -0,0 +1 @@ < +This is file3.txt. - $ quilt push -q - > Applying patch %{P}patch1.diff - > Now at patch %{P}patch1.diff + $ quilt diff | sed -e "s/\\t.*//" + > Index: d/file1.txt + > =================================================================== + > --- /dev/null + > +++ d/file1.txt + > @@ -0,0 +1 @@ + > +This is file1.txt. + > Index: d/dir/file3.txt + > =================================================================== + > --- /dev/null + > +++ d/dir/file3.txt + > @@ -0,0 +1 @@ + > +This is file3.txt. - $ quilt files - > file1.txt - > file2.txt + $ cd dir + $ quilt fold -q + < --- dir.orig/file3.txt + < +++ dir/file3.txt + < @@ -1 +1 @@ + < -This is file3.txt. + < +This is file3.txt, now modified. - $ quilt fold -q < patches/patch2.diff + $ cd .. $ quilt diff | sed -e "s/\\t.*//" > Index: d/file1.txt > =================================================================== @@ -47,7 +68,7 @@ > --- /dev/null > +++ d/dir/file3.txt > @@ -0,0 +1 @@ - > +This is file3.txt. + > +This is file3.txt, now modified. $ cd .. $ rm -rf d |