[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: format failure on diff --side-by-side
From: |
Frank Hemer |
Subject: |
Re: format failure on diff --side-by-side |
Date: |
Thu, 25 Nov 2004 23:44:46 +0100 |
User-agent: |
KMail/1.5.1 |
Because the list blocks attachments, I post my test files uuencoded:
Revision 1.1:
begin 444 /dev/stdout
M;&EN92`Q"FQI;F4@,@IL:6YE(#,*;&EN92`T"FQI;F4@-0H@("`@("`@("`\
M=')A;G-L871I;VX^06YD97)U;F<@96EN<&9L96=E;CPO=')A;G-L871I;VX^
M"B`@("`@("`@(#QT<F%N<VQA=&EO;C[#A&YD97)U;F<@96EN<&9L96=E;CPO
M=')A;G-L871I;VX^"B`@("`@("`@(#QT<F%N<VQA=&EO;C[#A,.$;F1E<G5N
M9R!E:6YP9FQE9V5N/"]T<F%N<VQA=&EO;CX*("`@("`@("`@/'1R86YS;&%T
M:6]N/L.$PX3#A&YD97)U;F<@96EN<&9L96=E;CPO=')A;G-L871I;VX^"B`@
M("`@("`@(#QT<F%N<VQA=&EO;C[#A,.$PX3#A&YD97)U;F<@96EN<&9L96=E
M;CPO=')A;G-L871I;VX^"FQI;F4@,3$*;&EN92`Q,@IL:6YE(#$S"FQI;F4@
M,30*;&EN92`Q-0IA8F-D969G:&EJ:VQM;F]P<7)S='5V=WAY>D%"0T1%1D=(
M24I+3$U.3U!14E-455976%E:"FQI;F4@,3<*;&EN92`Q.`IL:6YE(#$Y"FQI
.;F4@,C`*;&EN92`R,0H`
`
end
Revision 1.2:
begin 644 /dev/stdout
M;&EN92`Q"FQI;F4@,@IL:6YE(#,*;&EN92`T"FQI;F4@-0H@("`@("`@("`\
M=')A;G-L871I;VX^06YD97)U;F<@96EN<&9L96=E;CPO=')A;G-L871I;VX^
M"B`@("`@("`@(#QT<F%N<VQA=&EO;CY!;F1E<G5N9R!E:6YP9FQE9V5N/"]T
M<F%N<VQA=&EO;CX*("`@("`@("`@/'1R86YS;&%T:6]N/D%!;F1E<G5N9R!E
M:6YP9FQE9V5N/"]T<F%N<VQA=&EO;CX*("`@("`@("`@/'1R86YS;&%T:6]N
M/D%!06YD97)U;F<@96EN<&9L96=E;CPO=')A;G-L871I;VX^"B`@("`@("`@
M(#QT<F%N<VQA=&EO;CY!04%!;F1E<G5N9R!E:6YP9FQE9V5N/"]T<F%N<VQA
M=&EO;CX*;&EN92`Q,0IL:6YE(#$R"FQI;F4@,3,*;&EN92`Q-`IL:6YE(#$U
M"F%B8V1E9F=H:6IK;&UN;W!Q<G-T=79W>'EZ04)#1$5&1T@Q2DM,34Y/4%%2
M4U155E=865H*;&EN92`Q-PIL:6YE(#$X"FQI;F4@,3D*;&EN92`R,`IL:6YE
$(#(Q"@``
`
end
The command:
cvs diff -N --side-by-side -t -W100 -r1.1 -r1.2 file.txt
The output:
begin 644 /dev/stdout
M26YD97@Z(&9I;&4N='AT"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T*4D-3(&9I
M;&4Z("]#5E-?4D]/5"]M;V1U;&5?8VAA=%]T97-T+V9I;&4N='AT+'8*<F5T
M<FEE=FEN9R!R979I<VEO;B`Q+C$*9&EF9B`M+7-I9&4M8GDM<VED92`M="`M
M5S$P,"`M<C$N,2!F:6QE+G1X=`IL:6YE(#$@("`@("`@("`@("`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@;&EN92`Q"FQI;F4@,B`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("!L:6YE
M(#(*;&EN92`S("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@
M("`@("`@("`@(&QI;F4@,PIL:6YE(#0@("`@("`@("`@("`@("`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@;&EN92`T"FQI;F4@-2`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("!L:6YE(#4*
M("`@("`@("`@/'1R86YS;&%T:6]N/D%N9&5R=6YG(&5I;G!F;&5G96X\+W1R
M86YS("`@("`@("`@("`@(#QT<F%N<VQA=&EO;CY!;F1E<G5N9R!E:6YP9FQE
M9V5N/"]T<F%N<PH@("`@("`@("`\=')A;G-L871I;VX^PX1N9&5R=6YG(&5I
M;G!F;&5G96X\+W1R86YS;"!\("`@("`@("`@("`\=')A;G-L871I;VX^06YD
M97)U;F<@96EN<&9L96=E;CPO=')A;G,*("`@("`@("`@/'1R86YS;&%T:6]N
M/L.$PX1N9&5R=6YG(&5I;G!F;&5G96X\+W1R86YS;"!\("`@("`@("`@("`\
M=')A;G-L871I;VX^04%N9&5R=6YG(&5I;G!F;&5G96X\+W1R86X*("`@("`@
M("`@/'1R86YS;&%T:6]N/L.$PX3#A&YD97)U;F<@96EN<&9L96=E;CPO=')A
M;G-L('P@("`@("`@("`@(#QT<F%N<VQA=&EO;CY!04%N9&5R=6YG(&5I;G!F
M;&5G96X\+W1R80H@("`@("`@("`\=')A;G-L871I;VX^PX3#A,.$PX1N9&5R
M=6YG(&5I;G!F;&5G96X\+W1R86YS;"!\("`@("`@("`@("`\=')A;G-L871I
M;VX^04%!06YD97)U;F<@96EN<&9L96=E;CPO='(*;&EN92`Q,2`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@(&QI;F4@,3$*
M;&EN92`Q,B`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@
M("`@("`@(&QI;F4@,3(*;&EN92`Q,R`@("`@("`@("`@("`@("`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@(&QI;F4@,3,*;&EN92`Q-"`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@(&QI;F4@,30*
M;&EN92`Q-2`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@
M("`@("`@(&QI;F4@,34*86)C9&5F9VAI:FML;6YO<'%R<W1U=G=X>7I!0D-$
M149'2$E*2TQ-3D]045)35%56('P@(&%B8V1E9F=H:6IK;&UN;W!Q<G-T=79W
M>'EZ04)#1$5&1T@Q2DM,34Y/4%%24U155@IL:6YE(#$W("`@("`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@;&EN92`Q-PIL:6YE
M(#$X("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@
M("`@;&EN92`Q.`IL:6YE(#$Y("`@("`@("`@("`@("`@("`@("`@("`@("`@
M("`@("`@("`@("`@("`@("`@;&EN92`Q.0IL:6YE(#(P("`@("`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@;&EN92`R,`IL:6YE
M(#(Q("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@
+("`@;&EN92`R,0H`
`
end
the problem is not the char-translation but the fact that diff
--side-by-side should truncate lines to half of the given width but it seems
that wide chars are completely ignored so the lines are longer for the amount
of wide chars they hold.
Frank