diff options
| -rw-r--r-- | BUGS | 6 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | doc/README.in | 2 | ||||
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 4 | ||||
| -rw-r--r-- | po/quilt.pot | 4 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/refresh.in | 4 | ||||
| -rw-r--r-- | scripts/patchfns.in | 26 |
10 files changed, 31 insertions, 32 deletions
@@ -1,6 +0,0 @@ -* Patch destroys the backup files it generates if a file appears more - than once in a patch. This is the reason why we use the backup-files - utility instead. - -* rpatch should only look at .pc/applied-patches, not at the series - file. diff --git a/Makefile.in b/Makefile.in index e99f33d..6d10788 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,7 @@ ISODATE := $(shell date +%Y-%m-%d) DIRT += $(shell find -name '*~') DIRT += $(shell find -name '.\#*') -SRC += COPYING AUTHORS TODO BUGS Makefile.in \ +SRC += COPYING AUTHORS TODO Makefile.in \ configure.ac config/install-sh \ quilt.spec.in quilt.changes \ bash_completion quilt.quiltrc diff --git a/doc/README.in b/doc/README.in index 446574c..412610c 100644 --- a/doc/README.in +++ b/doc/README.in @@ -31,5 +31,5 @@ touched-by-patch filename backup-files A simple utility that creates / restores / removes - backup files; this works around a patch bug (see BUGS). + backup files. @@ -1164,7 +1164,7 @@ msgstr "" "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" -#: ../scripts/patchfns.in:742 +#: ../scripts/patchfns.in:740 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 " @@ -1177,7 +1177,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: ../scripts/patchfns.in:819 +#: ../scripts/patchfns.in:817 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1139,7 +1139,7 @@ msgstr "" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" -#: ../scripts/patchfns.in:742 +#: ../scripts/patchfns.in:740 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 " @@ -1151,7 +1151,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: ../scripts/patchfns.in:819 +#: ../scripts/patchfns.in:817 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1153,7 +1153,7 @@ msgstr "" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" -#: ../scripts/patchfns.in:742 +#: ../scripts/patchfns.in:740 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 " @@ -1165,7 +1165,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: ../scripts/patchfns.in:819 +#: ../scripts/patchfns.in:817 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 932d9d9..829e95a 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -833,7 +833,7 @@ msgid "" "patches from scratch.\\n" msgstr "" -#: ../scripts/patchfns.in:742 +#: ../scripts/patchfns.in:740 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 " @@ -841,7 +841,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: ../scripts/patchfns.in:819 +#: ../scripts/patchfns.in:817 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/quilt.changes b/quilt.changes index 8904959..dc4219c 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Jul 2 13:51:50 CEST 2005 - agruen@suse.de + +- Remove outdated BUGS file and references. +- refresh command: don't write into existing patches but create + new files instead to avoid overwriting hardlinked copies. + +------------------------------------------------------------------- Fri Jul 1 16:48:38 CEST 2005 - khali@linux-fr.org - configure.ac: Add a test on diffstat version. Versions prior diff --git a/quilt/refresh.in b/quilt/refresh.in index 2bf70e0..c3a7fc9 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -295,8 +295,8 @@ if [ -e $patch_file ] && \ then printf $"Patch %s is unchanged\n" "$(print_patch $patch)" elif ( [ -z "$QUILT_BACKUP" -o ! -e $patch_file ] || \ - cp $patch_file $patch_file~ ) && \ - cat_to_file $patch_file < $tmp_result + mv $patch_file $patch_file~ ) && \ + cat_to_new_file $patch_file < $tmp_result then printf $"Refreshed patch %s\n" "$(print_patch $patch)" else diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 6caf2ca..b46b362 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -610,23 +610,21 @@ cat_file() done } -cat_to_file() +cat_to_new_file() { local filename="$1" - if [ -z "$filename" ] - then - cat - else - case "$filename" in - *.gz|*.tgz) - gzip -c > "$filename" ;; - *.bz2) - bzip2 -c > "$filename" ;; - *) - cat > "$filename" ;; - esac - fi + [ -e "$filename" ] && rm -f "$filename" + + case "$filename" in + *.gz) + gzip -c ;; + *.bz2) + bzip2 -c ;; + *) + cat ;; + esac \ + > "$filename" } patch_description() |