forwarded 305828 [EMAIL PROTECTED] thanks Hi,
not entirely sure what's going on there, but rediff definitely gets confused when all hunks for a file are removed. I think it's still expecting the patch header for the removed file. -Michael
--- Begin Message ---Package: patchutils Version: 0.2.30-1 Severity: normal Tags: upstream Given the following patch diff -ur 1/a 2/a --- 1/a 2005-04-22 12:45:33.000000000 +0200 +++ 2/a 2005-04-22 12:45:48.000000000 +0200 @@ -1 +1 @@ -a +c diff -ur 1/b 2/b --- 1/b 2005-04-22 12:45:36.000000000 +0200 +++ 2/b 2005-04-22 12:45:49.000000000 +0200 @@ -1 +1 @@ -b +d Launching editdiff, removing the first part so that only diff -ur 1/b 2/b --- 1/b 2005-04-22 12:45:36.000000000 +0200 +++ 2/b 2005-04-22 12:45:49.000000000 +0200 @@ -1 +1 @@ -b +d remains in the patch, then rediff aborts rediff: src/rediff.c:506: show_modified_hunk: Assertion `r != -1' failed. /usr/bin/editdiff: line 73: 14131 Abort (core dumped) rediff "${TMPD}/${NAME}.orig" "${TMPD}/${NAME}" >"${FILE}" rediff failed. On the other hand, removing the second part so that only diff -ur 1/a 2/a --- 1/a 2005-04-22 12:45:33.000000000 +0200 +++ 2/a 2005-04-22 12:45:48.000000000 +0200 @@ -1 +1 @@ -a +c remains in the patch, then rediff complains: rediff: Not supported: -d rediff failed. Regards, Samuel Thibault -- System Information: Debian Release: 3.1 APT prefers unstable APT policy: (100, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.11 Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15) Versions of packages patchutils depends on: ii debianutils 2.13.2 Miscellaneous utilities specific t ii libc6 2.3.2.ds1-21 GNU C Library: Shared libraries an ii patch 2.5.9-2 Apply a diff file to an original ii perl 5.8.4-8 Larry Wall's Practical Extraction -- no debconf information
--- End Message ---
