Code review comment for lp:~mwhudson/launchpad-cscvs/merge-creates-file-bug-120977-attempt-2

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Hi there,

This bug is the predictably tiny (a few characters!) fix for the infamous linked cvs-import-killing bug.

It turns out that the issue is rather similar to the add-delete-readd case, so the way I've fixed it very much matches how that is handled. The way this case is handled is labelled as a hack in the source, but my attempt at fixing it "properly" made the process of building the catalog more than 10 times slower, and I don't understand the catalog building code well enough to spot a better fix.

There is no unit test coverage for this code (making the patched method error unconditionally only makes two unit tests fail!) but I've added two acceptance tests that exercise this code from the shell (one exercises the add/delete/readd case and the other the case from the bug). They're quite confusing, but commented. Please point out areas that are still too confusing.

Cheers,
mwh

« Back to merge proposal