diff options
-rw-r--r-- | po/de.po | 12 | ||||
-rw-r--r-- | po/fr.po | 8 | ||||
-rw-r--r-- | po/quilt.pot | 8 | ||||
-rw-r--r-- | quilt.changes | 10 | ||||
-rw-r--r-- | quilt/new.in | 8 |
5 files changed, 19 insertions, 27 deletions
@@ -448,18 +448,14 @@ msgstr "" "ihn nach dem obersten Patch in die series-Datei ein.\n" #: ../quilt/new.in:64 -msgid "Warning: directory %s exists; ignoring\\n" -msgstr "Warnung: Verzeichnis %s existiert; ignoriere\\n" - -#: ../quilt/new.in:72 msgid "Patch %s exists already\\n" msgstr "Patch %s existiert bereits\\n" -#: ../quilt/new.in:83 +#: ../quilt/new.in:75 msgid "Failed to create patch %s\\n" msgstr "Konnte Patch %s nicht erzeugen\\n" -#: ../quilt/new.in:86 +#: ../quilt/new.in:78 msgid "Patch %s is now on top\\n" msgstr "Der oberste Patch ist jetzt %s\\n" @@ -988,7 +984,9 @@ msgstr "Verwendung: %s [-fRq] patchname\\n" #: ../scripts/rpatch.in:100 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" -msgstr "Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen erzwingen mit -f)\\n" +msgstr "" +"Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen " +"erzwingen mit -f)\\n" #: ../scripts/rpatch.in:123 msgid "Removing patch %s\\n" @@ -457,18 +457,14 @@ msgstr "" "au sommet dans le fichier de série.\n" #: ../quilt/new.in:64 -msgid "Warning: directory %s exists; ignoring\\n" -msgstr "Avertissement : le repertoire %s existe; ignoré\\n" - -#: ../quilt/new.in:72 msgid "Patch %s exists already\\n" msgstr "Le patch %s existe déjà\\n" -#: ../quilt/new.in:83 +#: ../quilt/new.in:75 msgid "Failed to create patch %s\\n" msgstr "Impossible de crée le patch %s\\n" -#: ../quilt/new.in:86 +#: ../quilt/new.in:78 msgid "Patch %s is now on top\\n" msgstr "Le patch %s est maintenant au sommet\\n" diff --git a/po/quilt.pot b/po/quilt.pot index c95e75e..1f815e3 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -329,18 +329,14 @@ msgid "" msgstr "" #: ../quilt/new.in:64 -msgid "Warning: directory %s exists; ignoring\\n" -msgstr "" - -#: ../quilt/new.in:72 msgid "Patch %s exists already\\n" msgstr "" -#: ../quilt/new.in:83 +#: ../quilt/new.in:75 msgid "Failed to create patch %s\\n" msgstr "" -#: ../quilt/new.in:86 +#: ../quilt/new.in:78 msgid "Patch %s is now on top\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 29f836f..c864e8e 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Aug 11 09:18:56 CEST 2004 - agruen@suse.de + +- Working in sub-directories: `quilt new' so far did always + create patches in the current directory, even if the current + directory appeared to be a sub-directory of the working tree. + This was confusing for several people now. Make `quilt new' + behave like all other commands, and thus allow it to be used + from within sub-directories. + +------------------------------------------------------------------- Sat Aug 7 14:47:53 PDT 2004 - mquinson@fuxfamily.org - Small fix by Yasushi SHOJI: display the name of the patch which is not diff --git a/quilt/new.in b/quilt/new.in index 331995c..f35f8d2 100644 --- a/quilt/new.in +++ b/quilt/new.in @@ -59,14 +59,6 @@ fi patch=${1#$QUILT_PATCHES/} -if [ -n "$SUBDIR" ] -then - printf $"Warning: directory %s exists; ignoring\n" \ - "$SUBDIR_DOWN$QUILT_PATCHES" >&2 - cd $SUBDIR - unset SUBDIR -fi - if patch_in_series $patch then printf $"Patch %s exists already\n" "$(print_patch $patch)" >&2 |