[svk-devel] smerge crash (+ patch, tests, other crash)
Chia-Liang Kao
clkao at clkao.org
Sun Mar 4 18:32:58 EST 2007
On 23/02/07, Daniel Jacobowitz <drow at false.org> wrote:
> We tried to smerge from a branch where a file had been moved from one
> directory to another. SVK 2.0.0 and trunk crash; it tried to open a
> base file in the root of the checkout when the file was really in a
> subdirectory. I think the patch below is correct for that case;
> apply_textdelta ought to get the baton returned by open_file.
>
> Unfortunately the first of the two testcases I wrote for this problem
> still fails and I can't figure out what's going on (end of
> 07smerge-rename.t). It now reports:
It turns that the crash is related to a bug I was fixing a while ago.
The code in Editor::XD preparing a file as base for copy+edit is
wrong. The fix was just committed in r2308. Thanks for the tests!
That was really helpful.
Cheers,
CLK
More information about the svk-devel
mailing list