Mercurial > hg

annotate tests/test-diff-binary-file.out @ 5624:3da5ff2a9b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
win32: it is no longer necessary to bundle patch.exe Mercurial can use it's built-in mpatch library
author Steve Borho <steve@borho.org>
date Fri, 07 Dec 2007 18:18:11 -0600
parents 797dbdd4d7e1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4104
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
1 % diff -r 0 -r 1
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2 diff -r 48b371597640 -r acea2ab458c8 binfile.bin
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
3 Binary file binfile.bin has changed
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
4 % diff -r 0 -r 2
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
5 % diff --git -r 0 -r 1
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
6 diff --git a/binfile.bin b/binfile.bin
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
7 index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
8 GIT binary patch
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
9 literal 594
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
10 zc$@)J0<HatP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
11 z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
12 zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
13 z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
14 zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
15 ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
16 zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
17 z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
18 zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
19 z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
20 zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
21 gQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf3JwksH2?qr
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
22
0934fef871f3 add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
23 % diff --git -r 0 -r 2