Hi, Julian, Von: Julian Foad [mailto:julianf...@btopenworld.com] > Markus Schaber wrote: > > > Second iteration of my patch for fixing issue #4395. > > http://subversion.tigris.org/issues/show_bug.cgi?id=4395 > > The issue report is unclear. What are the 'from' and 'to' versions > meant to be? Is the repro recipe meant to check out with 1.6 and > then upgrade to 1.7? As written it appears to check out with 1.7 and > upgrade to ... unspecified.
I can reproduce the bug when upgrading an 1.7 WC using trunk. The bug report states version 1.8.x, so I strongly guess 1.8.x is also affected. (I don't have an 1.8 version lying around right now...) Upgrading from 1.6.x or older seems to work fine, but nevertheless, I did add test coverage for 1.4, 1.5 and 1.6 format working copies in addition to 1.7. > Is this fix intended for all of: 1.7, 1.8 and trunk? I primarily intended it for trunk, but I won't object backporting it. Best regards Markus Schaber CODESYS® a trademark of 3S-Smart Software Solutions GmbH Inspiring Automation Solutions 3S-Smart Software Solutions GmbH Dipl.-Inf. Markus Schaber | Product Development Core Technology Memminger Str. 151 | 87439 Kempten | Germany Tel. +49-831-54031-979 | Fax +49-831-54031-50 E-Mail: m.scha...@codesys.com | Web: http://www.codesys.com | CODESYS store: http://store.codesys.com CODESYS forum: http://forum.codesys.com Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915 > > - Julian > > > > The fix itself is actually unchanged, but I added a test case which > > upgrades some working copies of different formats and checks > whether > > the "format" and "entries" files are present and correct. > > > > [[[ > > Fix issue 4395 by not deleting the format and entries file when we > > upgrade from an 1.7 working copy. > > > > * subversion/libsvn_wc/upgrade.c > > (wipe_obsolete_files): Add a boolean parameter > remove_format_entries > > declaring whether we should wipe format and entry files. > > (svn_wc__wipe_postupgrade): Pass TRUE for remove_format_entries > to > > keep the old behavior for pre-1.7 working copies. > > (svn_wc__upgrade_sdb): Pass FALSE for remove_format_entries to > keep > > the files when upgrading from an 1.7 (or newer) working copy. > > > > * subversion/tests/cmdline/upgrade_tests.py > > (upgrade_dropped_status_entries_files): Add a new test case to > check > > that the "entries" and "format" files are retained during > upgrade. > > ]]]
