Re: AW: [Patch] Fix for Issue #4395: 'svn upgrade' loses 1.6-client format files

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.

Is this fix intended for all of: 1.7, 1.8 and trunk?

- 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.
> ]]]
Received on 2014-06-20 17:49:28 CEST