Re: diff_file_diff3 spins

Chia-liang Kao <clkao <at> clkao.org> writes:
> Doing merge on with the following files:
>
> $ ab -clkao- [~] wc /tmp/bad-*
> 0 0 0 /tmp/bad-empty.csv
> 62946 62946 880992 /tmp/bad-local.csv
> 68633 68633 1029132 /tmp/bad-new.csv
> 131579 131579 1910124 total
>
> causes diff_file_diff3 to spin.

Actually it finishes after 3 minutes:

$ ab -clkao- [/tmp/diff_file_diff3] time perl diff.t
_p_svn_diff_t=SCALAR(0x804d23c) at diff.t line 4.
158.366u 1.264s 3:00.50 88.4% 10+16118k 0+0io 0pf+0w

But with /usr/bin/diff3:

$ ab -clkao- [/tmp/diff_file_diff3] time diff3 bad-empty.csv bad-local.csv
bad-new.csv > /dev/null
0.455u 0.055s 0:00.64 78.1% 48+9124k 0+0io 0pf+0w

Cheers,
CLK

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 25 10:59:39 2005