Re: [Quilt-dev] [patch 6/7] Exit with an error when diffs retcode=2 (error) on patch

[Martin Quinson]

Hello Jean,

On Sun, Jan 12, 2014 at 12:28:37PM +0100, Jean Delvare wrote:
> 
> > But unfortunately, I fail to put your idea into practice because I
> > fail to get the right parsing in the test file. If the test file reads
> >     $ printf "\x02\x00\x01" > test
> > I get x02x00x01 in the diff. I tried several combination, in vain.
> > 
> > Jean, you just rewrote the main loop and variable substitution parts
> > of test/run. Do you have an idea of how to fix that too, please?
> 
> Well, just doubling the backslashes did the trick for me. The following
> test case works for me (bash versions 3.2.51 and 4.2.45):
> 
>       $ printf "\\x02\\x00\\x01" > test.bin
> 
>       $ quilt new test2.diff
>       > Patch %{P}test2.diff is now on top
>       $ quilt add test.bin
>       > File test.bin added to patch %{P}test2.diff
> 
>       $ printf "\\x03\\x00\\x01" > test.bin
>       $ quilt diff -pab --no-index
>       >~ (Files|Binary files) a/test\.bin and b/test\.bin differ
> 
> Does it not work for you?

Nope. It gives me the following, where the printf argument is written
textually but not interpreted (bash 4.2.45).

[33] $ quilt diff -pab --no-index -- failed
--- a/test.bin                        !~ (Files|Binary files) a/test\.bin and 
b/test\.bin differ
+++ b/test.bin                        != ~
@@ -1 +1 @@                           != ~
-\x02\x00\x01                         != ~
\ No newline at end of file           != ~
+\x03\x00\x01                         != ~
\ No newline at end of file           != ~

I'm quite puzzled, I must admit. Just in case, my patch is here:
http://anonscm.debian.org/gitweb/?p=collab-maint/quilt.git;a=blob;f=debian/patches/diff_exit_code;h=8c90d5384fa9962b71107b98eea145addd22514b;hb=HEAD

Sorry, Mt

-- 
L'informatique soit ça marche pas, soit ca marchait avant qu'on y touche.