Hello community, here is the log from the commit of package quilt checked in at Mon Apr 24 16:27:10 CEST 2006. -------- --- quilt/quilt.changes 2006-04-19 15:01:16.000000000 +0200 +++ STABLE/quilt/quilt.changes 2006-04-24 15:27:55.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 24 15:25:28 CEST 2006 - jdelvare@suse.de + +- import-compressed.diff: Fix replacement of compressed patches. + +------------------------------------------------------------------- New: ---- import-compressed.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.vPEhYg/_old 2006-04-24 16:26:37.000000000 +0200 +++ /var/tmp/diff_new_pack.vPEhYg/_new 2006-04-24 16:26:37.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL Group: Productivity/Text/Utilities Version: 0.44 -Release: 11 +Release: 13 Requires: coreutils diffutils patch gzip bzip2 perl mktemp Autoreqprov: off Source: %{name}-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Patch7: edit2.diff Patch8: mail-fix.diff Patch9: pop-error-path-fix.diff +Patch10: import-compressed.diff Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,6 +56,7 @@ %patch7 -p0 %patch8 -p0 %patch9 -p0 +%patch10 -p0 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -105,6 +107,8 @@ %doc doc/quilt.pdf %changelog -n quilt +* Mon Apr 24 2006 - jdelvare@suse.de +- import-compressed.diff: Fix replacement of compressed patches. * Wed Apr 19 2006 - agruen@suse.de - pop-error-path-fix.diff: Fix bogus error message. * Sat Mar 25 2006 - agruen@suse.de ++++++ import-compressed.diff ++++++ =================================================================== RCS file: /sources/quilt/quilt/quilt/import.in,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- quilt/import.in 2006/01/29 09:55:44 1.38 +++ quilt/import.in 2006/03/05 09:42:42 1.39 @@ -51,8 +51,8 @@ local old="$1" new="$2" local old_desc=$(gen_tempfile) new_desc=$(gen_tempfile) - cat "$old" | patch_header | strip_diffstat > $old_desc - cat "$new" | patch_header | strip_diffstat > $new_desc + cat_file "$old" | patch_header | strip_diffstat > $old_desc + cat_file "$new" | patch_header | strip_diffstat > $new_desc if [ -z "$opt_desc" ] then @@ -79,9 +79,9 @@ [ "$opt_desc" = a ] && echo '---' if [ "$opt_desc" = o ] then - cat "$new" | patch_body + cat_file "$new" | patch_body else - cat "$new" + cat_file "$new" fi rm -f $old_desc $new_desc } @@ -190,7 +190,10 @@ fi if [ "$merged_patch_file" != "$dest" ] && \ - ! cp "$merged_patch_file" "$dest" + (( [ "$merged_patch_file" != "$patch_file" ] && \ + ! cat_to_new_file "$dest" < "$merged_patch_file" ) || \ + ( [ "$merged_patch_file" = "$patch_file" ] && \ + ! cp "$merged_patch_file" "$dest" )) then printf $"Failed to import patch %s\n" "$(print_patch $patch)" >&2 die 1 --- /dev/null 2006-04-09 17:27:20.000000000 +0200 +++ test/import2.test 2006-04-24 12:57:53.000000000 +0200 @@ -0,0 +1,143 @@ +# same as import.test, but with compressed patches + + $ rm -rf d + $ mkdir -p d/patches + $ cd d + + $ quilt new patch1.diff + > Patch %{P}patch1.diff is now on top + + $ quilt add f + > File f added to patch %{P}patch1.diff + + $ echo f > f + + $ quilt refresh + > Refreshed patch %{P}patch1.diff + + $ quilt pop + > Removing patch %{P}patch1.diff + > Removing f + > + > No patches applied + + $ mkdir t + $ gzip < patches/patch1.diff > t/patch1.diff.gz + $ rm -f patches/patch1.diff + + # test importing into an empty series + $ rm -rf patches/ .pc/ + $ mkdir patches + $ quilt import t/patch1.diff.gz + > Importing patch t/patch1.diff.gz (stored as %{P}patch1.diff.gz) + + $ quilt push + > Applying patch %{P}patch1.diff.gz + >~ patching file `?f'? + > + > Now at patch %{P}patch1.diff.gz + + $ quilt new patch2.diff.gz + > Patch %{P}patch2.diff.gz is now on top + + $ quilt add g + > File g added to patch %{P}patch2.diff.gz + + $ echo g > g + + $ quilt refresh + > Refreshed patch %{P}patch2.diff.gz + + $ quilt pop + > Removing patch %{P}patch2.diff.gz + > Removing g + > + > Now at patch %{P}patch1.diff.gz + + $ quilt header -a + < original description + > Appended text to header of patch %{P}patch1.diff.gz + + $ quilt pop + > Removing patch %{P}patch1.diff.gz + > Removing f + > + > No patches applied + + $ quilt delete patch1 + > Removed patch %{P}patch1.diff.gz + + $ cat %{P}series + > patch2.diff.gz + + # test a few error cases + + $ quilt import missing.diff.gz + > Patch missing.diff.gz does not exist + + $ quilt import patches/patch1.diff.gz + > Importing patch %{P}patch1.diff.gz + + $ quilt import patches/patch2.diff.gz + > Patch %{P}patch2.diff.gz already exists in series. + + # a simple use of import + + $ quilt import t/patch1.diff.gz + > Patch %{P}patch1.diff.gz exists. Replace with -f. + + $ quilt import -f t/patch1.diff.gz + > Replacing patch %{P}patch1.diff.gz with new version + + # an import requiring a description merge + $ zcat patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz + $ quilt import t/patch1.diff.gz + > Patch %{P}patch1.diff.gz exists. Replace with -f. + + $ quilt import -f t/patch1.diff.gz + > Patch headers differ: + > @@ -1 +1 @@ + > -original description + > +new description + > Please use -d {o|a|n} to specify which patch header(s) to keep. + + $ quilt import -d a -f t/patch1.diff.gz + > Replacing patch %{P}patch1.diff.gz with new version + + # quilt header does not work in this case because it stops at '---' + $ zcat patches/patch1.diff.gz | head -n 3 + > original description + > --- + > new description + + $ quilt import -d n -f t/patch1.diff.gz + > Replacing patch %{P}patch1.diff.gz with new version + + $ quilt header patch1 + > new description + + $ quilt delete patch1 + > Removed patch %{P}patch1.diff.gz + + # make sure it accepts non-conflicting names + # a small presentation problem here + + $ cp patches/patch1.diff.gz t/patch1.patch.gz + $ quilt import t/patch1.patch.gz + > Importing patch t/patch1.patch.gz (stored as %{P}patch1.patch.gz) + + $ ls patches/ + > patch1.diff.gz + > patch1.patch.gz + > patch2.diff.gz + > series + + $ cat %{P}series + > patch1.patch.gz + > patch2.diff.gz + + $ quilt delete patch1.diff.gz + > Patch patch1.diff.gz is not in series + + $ cd .. + $ rm -rf d ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de