Hi,
r1551579 is nominated for 1.7.X backport by rhuijben, with a backport branch.
I wanted to test said branch to make my (non-binding) vote for this issue, and
it seems that the backport branch needs another fix added:
In r1427830, the function svn_wc__get_wc_root was renamed to svn_wc__get_wcroot:
http://svn.apache.org/viewvc?view=revision&revision=1427830
The backported code still uses the new name, so it did not build in my tests.
I propose the attached patch for the the 1.7.x-r1551579 branch:
Proposed commit message:
---
Revert the calls of the renamed svn_wc__get_wcroot back to svn_wc__get_wc_root,
so the fix compiles against SVN 1.7. (The function was renamed in r1427830.)
* subversion/libsvn_client/copy.c
(do_wc_to_wc_moves): Fixed function name to svn_wc__get_wc_root.
Approved by: <NN>
---
Due to my partial committer status, I can commit it myself after getting
approved by a dev. :-)
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: [email protected] | 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
Index: subversion/libsvn_client/copy.c
===================================================================
--- subversion/libsvn_client/copy.c (revision 1556818)
+++ subversion/libsvn_client/copy.c (working copy)
@@ -388,10 +388,10 @@
src_parent_abspath = svn_dirent_dirname(pair->src_abspath_or_url,
iterpool);
- SVN_ERR(svn_wc__get_wcroot(&src_wcroot_abspath,
+ SVN_ERR(svn_wc__get_wc_root(&src_wcroot_abspath,
ctx->wc_ctx, src_parent_abspath,
iterpool, iterpool));
- SVN_ERR(svn_wc__get_wcroot(&dst_wcroot_abspath,
+ SVN_ERR(svn_wc__get_wc_root(&dst_wcroot_abspath,
ctx->wc_ctx, pair->dst_parent_abspath,
iterpool, iterpool));
