"Bert Huijben" <b...@vmoo.com> writes: >> * subversion/tests/cmdline/upgrade_tests.py >> (text_base_path): Restore MD5 support removed in r960036. > > I think the real fix would be to upgrade to SHA1 (and add the > mapping in the pristines table) in the upgrade step. I expected that > this was already handled?
Yes, that needs to happen, and no, it doesn't happen yet. The new code stores SHA1 on checkout/update but the upgrade code simply copies the MD5 and doesn't do MD5 to SHA1 conversion. I discussed this with Julian on IRC yesterday, the plan is to remove the MD5 support eventually. There are two cases to consider, upgrade from 1.6 to latest and upgrade from older 1.7 to latest. For the older 1.7 upgrade we can simply use the PRISTINE table to replace the MD5 with the corresponding SHA1 in the bump_to_19 code. The 1.6 upgrade is a bit harder. We can do the text-base to pristine before doing the entries file, so that the PRISTINE table is available, but the table is not currently indexed on MD5. As there is now only one table per wc it might be too slow if there are lots of files. We may need an MD5 index, as part of PRISTINE or separate, just for the duration of the upgrade. The bump_to_19 code can do the MD5 to SHA1 conversion before switching to single-db, the table is smaller and may not need an MD5 index (and the bump_to_19 code simply isn't as important as the 1.6 upgrade code). -- Philip
