Hi,
Second iteration of my patch for fixing issue #4395.
http://subversion.tigris.org/issues/show_bug.cgi?id=4395
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.
]]]
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.schaber@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
> -----Ursprüngliche Nachricht-----
> Von: Markus Schaber [mailto:m.schaber_at_codesys.com]
> Gesendet: Freitag, 20. Juni 2014 12:36
> An: Subversion Dev (dev_at_subversion.apache.org)
> Betreff: [Patch] Fix for Issue #4395: 'svn upgrade' loses 1.6-client
> format files
>
> Hi,
>
> See attached my patch for fixing issue #4395.
> http://subversion.tigris.org/issues/show_bug.cgi?id=4395
>
> [[[
> 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.
> ]]]
>
>
> All tests still pass after applying that change, but it seems the
> change itself is not covered by any tests. Should I add a test case
> for it? If yes, how to get/create 1.6 and 1.7 working copies within
> the test suite?
>
>
> Best regards
>
> Markus Schaber
>
> CODESYS(r) 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.schaber@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
Received on 2014-06-20 16:38:23 CEST