Show More
@@ -320,9 +320,10 b' Multiple binary files:' | |||
|
320 | 320 | 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 |
|
321 | 321 | a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 |
|
322 | 322 | |
|
323 | Binary file and delta hunk: | |
|
323 | Binary file and delta hunk (we build the patch using this sed hack to | |
|
324 | avoid an unquoted ^, which check-code says breaks sh on solaris): | |
|
324 | 325 | |
|
325 | $ hg import -d "1000000 0" -m delta - <<'EOF' | |
|
326 | $ sed 's/ caret /^/g;s/ dollarparen /$(/g' > quote-hack.patch <<'EOF' | |
|
326 | 327 | > diff --git a/delta b/delta |
|
327 | 328 | > new file mode 100644 |
|
328 | 329 | > index 0000000000000000000000000000000000000000..8c9b7831b231c2600843e303e66b521353a200b3 |
@@ -331,7 +332,7 b' Binary file and delta hunk:' | |||
|
331 | 332 | > zcmV;W4qEYvP)<h;3K|Lk000e1NJLTq006iE002D*0ssI2kt{U(0000PbVXQnQ*UN; |
|
332 | 333 | > zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=M@d9MRCwC#oC!>o#}>x{(W-y~UN*tK |
|
333 | 334 | > z%A%sxiUy2Ys)0Vm#ueArYKoYqX;GuiqZpgirM6nCVoYk?YNAz3G~z;BZ~@~&OQEe4 |
|
334 |
> zmGvS5isFJI;Pd_7J+EKxyHZeu` |
|
|
335 | > zmGvS5isFJI;Pd_7J+EKxyHZeu` caret t4r2>F;h-+VK3{_{WoGv8dSpFDYDrA%3UX03pt | |
|
335 | 336 | > zOaVoi0*W#P6lDr1$`nwPDWE7*rhuYM0Y#YtiZTThWeO<D6i}2YpqR<%$s>bRRaI42 |
|
336 | 337 | > zS3iFIxJ8Q=EnBv1Z7?pBw_bLjJb3V+tgP(Tty_2R-mR#p04x78n2n7MSOFyt4i1iv |
|
337 | 338 | > zjxH`PPEJmgD7U?IK&h;(EGQ@_DJc<@01=4fiNXHcKZ8LhZQ8T}E3U4tUS3}OrcgQW |
@@ -341,63 +342,63 b' Binary file and delta hunk:' | |||
|
341 | 342 | > zlAD+NAKhB{=;6bMwzjqn>9mavvKOGd`s%A+fBiL>Q;xJWpa72C+}u{JTHUX>{~}Qj |
|
342 | 343 | > zUb%hyHgN~c?cBLjInvUALMD9g-aXt54ZL8AOCvXL-V6!~ijR*kEG$&Mv?!pE61OlI |
|
343 | 344 | > z8nzMSPE8F7bH|Py*RNl1VUCggq<V)>@_6gkEeiz7{rmTeuNTW6+KVS#0FG%IHf-3L |
|
344 |
> zGiS21vn>WCCr+GLx |
|
|
345 |
> zAeA0HdhFS=$6|nzn3%YH`SN<>DQRO;Qc |
|
|
345 | > zGiS21vn>WCCr+GLx caret !uNetzB6u3o(w6&1C2?_LW8ij$+$sZ*zZ`|US3H@8N~%&V%Z | |
|
346 | > zAeA0HdhFS=$6|nzn3%YH`SN<>DQRO;Qc caret )dfdvA caret 5u`Xf;Zzu<ZQHgG?28V-#s<;T | |
|
346 | 347 | > zzkh#LA)v7gpoE5ou3o*GoUUF%b#iht&kl9d0)><$FE1}ACr68;uCA`6DrGmz_U+rp |
|
347 | 348 | > zL>Rx;X_yhk$fP_yJrTCQ|NgsW0A<985g&c@k-NKly<>mgU8n||ZPPV<`SN8#%$+-T |
|
348 |
> zfP$T!ou8jypFVwnzqhxyUvIxXd-wF~*U!ht=hCH1wzjqn9x#)IrhDa;S0JbK |
|
|
349 | > zfP$T!ou8jypFVwnzqhxyUvIxXd-wF~*U!ht=hCH1wzjqn9x#)IrhDa;S0JbK caret z_$W | |
|
349 | 350 | > zd(8rX@;7|t*;GJ5h$SZ{v(}+UBEs$4w~?{@9%`_Z<P<kox5bMWuUWH(sF9hONgd$Q |
|
350 |
> zunCgwT@1|CU9+;X |
|
|
351 | > zunCgwT@1|CU9+;X caret 4z&|M~@yw23Ay50NFWn=FqF%yLZEUty;AT2??1oV@B)Nt))J7 | |
|
351 | 352 | > zh>{5j2@f7T=-an%L_`E)h;mZ4D_5>?7tjQtVPRo2XU-&;mX(!l-MSTJP4XWY82JAC |
|
352 | 353 | > z@57+y&!1=P{Mn{W8)-HzEsgAtd63}Cazc>O6vGb>51%@9DzbyI3?4j~$ijmT95_IS |
|
353 |
> zS#r!LCDW%*4-O7CGnkr$xXR1RQ&UrA<CQt} |
|
|
354 | > zS#r!LCDW%*4-O7CGnkr$xXR1RQ&UrA<CQt} caret 73NL%zk`)Jk!yxUAt-1r}ggLn-Zq} | |
|
354 | 355 | > z*s){8pw68;i+kiG%CpBKYSJLLFyq&*U8}qDp+kpe&6<Vp(Z58%l#~>ZK?&s7y?b}i |
|
355 | 356 | > zuwcOgO%x-27A;y785zknl_{sU;E6v$8{pWmVS{KaJPpu`i;HP$#flY@u~Ua~K3%tN |
|
356 |
> z-LhrNh{9SoHgDd%WXTc$$~Dq{?AWou3!H&?V8K{ |
|
|
357 | > z-LhrNh{9SoHgDd%WXTc$$~Dq{?AWou3!H&?V8K{ caret {P9Ot5vecD?%1&-E-ntBFj87( | |
|
357 | 358 | > zy5`QE%QRX7qcHC%1{Ua}M~}L6=`wQUNEQ=I;qc+ZMMXtK2T+0os;jEco;}OV9z1w3 |
|
358 |
> zARqv |
|
|
359 |
> zj*X2ac;Pw3!I2|JShDaF>-gJmzm1NLj){rk&o|$E |
|
|
360 |
> zuJTaiCppM>-+c!wPzcUw)5@?J4U-u|pJ~xbWUe-C+60k |
|
|
359 | > zARqv caret bm-85xnRCng3OT|MyVSmR3ND7 caret ?KaQGG! caret (aTbo1N;Nz;X3Q9FJbwK6`0?Yp | |
|
360 | > zj*X2ac;Pw3!I2|JShDaF>-gJmzm1NLj){rk&o|$E caret WAsfrK=x&@B!`w7Hik81sPz4 | |
|
361 | > zuJTaiCppM>-+c!wPzcUw)5@?J4U-u|pJ~xbWUe-C+60k caret 7>9!)56DbjmA~`OJJ40v | |
|
361 | 362 | > zu3hCA7eJXZWeN|1iJLu87$;+fS8+Kq6O`aT)*_x@sY#t7LxwoEcVw*)cWhhQW@l%! |
|
362 |
> z{#Z=y+qcK@%z{p*D=8_Fcg278AnH3fI5;~yGu?9TscxXaaP*4$f<LIv! |
|
|
363 |
> zpxmunH#%=+ICMvZA~wyNH%~eMl!-g |
|
|
363 | > z{#Z=y+qcK@%z{p*D=8_Fcg278AnH3fI5;~yGu?9TscxXaaP*4$f<LIv! caret 5Lfr%vKg | |
|
364 | > zpxmunH#%=+ICMvZA~wyNH%~eMl!-g caret R!cYJ#WmLq5N8viz#J%%LPtkO?V)tZ81cp> | |
|
364 | 365 | > z{ALK?fNPePmd;289&M8Q3>YwgZX5GcGY&n>K1<x)!`;Qjg&}bb!Lrnl@xH#kS~VYE |
|
365 | 366 | > zpJmIJO`A3iy+Y3X`k>cY-@}Iw2Onq`=!ba3eATgs3yg3Wej=+P-Z8WF#w=RXvS@J3 |
|
366 | 367 | > zEyhVTj-gO?kfDu1g9afo<RkPrYzG#_yF41IFxF%Ylg>9lx6<clPweR-b7Hn+r)e1l |
|
367 |
> zO6c6FbNt@;;*w$z;N|H>h{czme)_4V6UC4hv**kX2@L |
|
|
368 | > zO6c6FbNt@;;*w$z;N|H>h{czme)_4V6UC4hv**kX2@L caret Bgds dollarparen &P7M4dhfmWe)!=B | |
|
368 | 369 | > zR3X=Y{P9N}p@-##@1ZNW1YbVaiP~D@8m&<dzEP&cO|87Ju#j*=;wH~Exr>i*Hpp&@ |
|
369 | 370 | > z`9!Sj+O;byD~s8qZ>6QB8uv7Bpn&&?xe;;e<M4F8KEID&pT7QmqoSgq&06adp5T=U |
|
370 | 371 | > z6DH*4=AB7C1D9Amu?ia-wtxSAlmTEO96XHx)-+rKP;ip$pukuSJGW3P1aUmc2yo%) |
|
371 | 372 | > z&<t3F>d1X+1qzaag-%x+eKHx{?Afz3GBQSw9u0lw<mB+I#v11TKRpKWQS+lvVL7=u |
|
372 | 373 | > zHr6)1ynEF<i3kO6A8&ppPMo-F=PnWfXkSj@i*7J6C<F}wR?s(O0niC?t+6;+k}pPq |
|
373 |
> zrok&TPU40rL0ZYDwenNrrmPZ`gjo@DEF`7 |
|
|
374 |
> z+1usk<%5G-y+R?tA`qY=)6&vNjL{P?QzHg%P%>`ZxP=QB%DHY6L26?36V_p |
|
|
375 |
> z3@9W=KmGI*Ng_Q#AzA%-z|Z |
|
|
376 |
> z1Qnxim_C-fmQuaAK_NUHUBV&;1c0V)wji<RcdZ*aAWTwyt>hVnlt |
|
|
374 | > zrok&TPU40rL0ZYDwenNrrmPZ`gjo@DEF`7 caret cKP||pUr;+r)hyn9O37=xA`3%Bj-ih | |
|
375 | > z+1usk<%5G-y+R?tA`qY=)6&vNjL{P?QzHg%P%>`ZxP=QB%DHY6L26?36V_p caret {}n$q | |
|
376 | > z3@9W=KmGI*Ng_Q#AzA%-z|Z caret |#oW(hkfgpuS$RKRhlrarX%efMMCs}GLChec5+y{6 | |
|
377 | > z1Qnxim_C-fmQuaAK_NUHUBV&;1c0V)wji<RcdZ*aAWTwyt>hVnlt caret asFCe0&a@tqp | |
|
377 | 378 | > zEEy;$L}D$X6)wfQNl8gu6Z>oB3_RrP=gTyK2@@w#LbQfLNHj>Q&z(C5wUFhK+}0aV |
|
378 | 379 | > zSohlc=7K+spN<ctf}5KgKqNyJDNP9;LZd)nTE=9|6Xdr9%Hzk63-tL2c9FD*rsyYY |
|
379 |
> z!}t+Yljq7-p$X;4_YL?6d;mdY3R##o1e%rlPxrsMh8|;sKTr~ |
|
|
380 |
> zp1#Gw!Qo-$LtvpXt#ApV0g) |
|
|
380 | > z!}t+Yljq7-p$X;4_YL?6d;mdY3R##o1e%rlPxrsMh8|;sKTr~ caret QD#sw3&vS$FwlTk | |
|
381 | > zp1#Gw!Qo-$LtvpXt#ApV0g) caret F=qFB`VB!W297x=$mr<$>rco3v$QKih_xN!k6;M=@ | |
|
381 | 382 |
> zCr? |
|
382 |
> zk+ |
|
|
383 |
> zld+peue4aYbg3C0!+4mu+} |
|
|
384 |
> zgM&## |
|
|
385 |
> zmclXc3i|Q#<; |
|
|
383 | > zk+ caret N&zCAiRns(?p6iBlk9v&h{1ve(FNtc)td51M>)TkXhc6{>5C)`fS$&)A1*CP1% | |
|
384 | > zld+peue4aYbg3C0!+4mu+}vE caret j_feX+ZijvffBI7Ofh#RZ*U3<3J5(+nfRCzexqQ5 | |
|
385 | > zgM&##Y4Dd{e%ZKjqrbm@|Ni}l4jo!AqtFynj3Xsd$o caret ?yV4$|UQ(j&UWCH>M=o_&N | |
|
386 | > zmclXc3i|Q#<;#EoG>~V}4unTHbUK}u=y4;rA3S&vzC3 caret aJP!&D4RvvGfoyo(>C>la | |
|
386 | 387 |
> zijP<=v>X{ |
|
387 | 388 |
> zg6W{3ATxYt#T?)3;SmIgOP4M|Dki~I_TX7SxP0x} |
|
388 | 389 |
|
|
389 | 390 |
> zQcj}IEufi1+Bnh6&(EhF{ |
|
390 | 391 |
> zwrmcd5MnP}xByB_)P@{J>DR9x6 |
|
391 | 392 | > zO#JGruV&1cL6VGK2?+_YQr4`+EY8;Sm$9U$uuGRN=uj3k7?O9b+R~J7t_y*K64ZnI |
|
392 |
> zM+{aE<b(v?vSmw;9zFP!aE266zHIhlmdI@ |
|
|
393 | > zM+{aE<b(v?vSmw;9zFP!aE266zHIhlmdI@ caret xa6o2jwdRk54a$>pcRbC29ZyG!Cfdp | |
|
393 | 394 | > zutFf`Q`vljgo!(wHf=)F#m2_MIuj;L(2ja2YsQRX+rswV{d<H`Ar;(@%aNa9VPU8Z |
|
394 | 395 |
> z;tq*`y}dm#NDJHKlV} |
|
395 | 396 |
> z@Bs) |
|
396 |
> zManE8 |
|
|
397 |
> zA?R$|wvC+m |
|
|
398 |
> z#~**JC8hE4@n{hO&8btT5F*?nC_%LhA3i)PDhh-pB_&1wGrDIl |
|
|
399 |
> zJd&86kq$%%907v |
|
|
400 |
> zKJ(|#H`$<5W+6ZkBb213rXonKZLB+X> |
|
|
397 | > zManE8 caret dLms-Q2;1kB<*Q1a3f8kZr;xX=!Qro@`~@xN*Qj>gx;i;0Z24!~i2uLb`}v | |
|
398 | > zA?R$|wvC+m caret Ups=*(4lDh*=UN8{5h(A?p#D caret 2N$8u4Z55!q?ZAh(iEEng9_Zi>IgO | |
|
399 | > z#~**JC8hE4@n{hO&8btT5F*?nC_%LhA3i)PDhh-pB_&1wGrDIl caret *=8x3n&;akBf caret - | |
|
400 | > zJd&86kq$%%907v caret tgWoQdwI`|oNK%VvU~S#C<o caret F?6c48?Cjj#-4P<>HFD%&|Ni~t | |
|
401 | > zKJ(|#H`$<5W+6ZkBb213rXonKZLB+X> caret L}J@W6osP3piLD_5?R!`S}*{xLBzFiL4@ | |
|
401 | 402 |
> zX+} |
|
402 | 403 |
> z{4ZSe`kOay5@=lAT!} |
|
403 | 404 | > P00000NkvXXu0mjfZ5|Er |
@@ -406,7 +407,9 b' Binary file and delta hunk:' | |||
|
406 | 407 | > HcmV?d00001 |
|
407 | 408 | > |
|
408 | 409 | > EOF |
|
409 | applying patch from stdin | |
|
410 | $ hg import -d "1000000 0" -m delta quote-hack.patch | |
|
411 | applying quote-hack.patch | |
|
412 | $ rm quote-hack.patch | |
|
410 | 413 | |
|
411 | 414 | $ hg manifest --debug | grep delta |
|
412 | 415 | 9600f98bb60ce732634d126aaa4ac1ec959c573e 644 delta |
General Comments 0
You need to be logged in to leave comments.
Login now