[cc -= users]
On Tue, Jan 19, 2021 at 10:50 PM Yasuhito FUTATSUKI
<futat...@yf.bsdclub.org> wrote:
> ... and trunk r1885656 as well.
>
> Parhaps this will fix it:
> [[[
> Index: subversion/svn/cl-conflicts.c
> ===================================================================
> --- subversion/svn/cl-conflicts.c (revision 1885656)
> +++ subversion/svn/cl-conflicts.c (working copy)
> @@ -452,7 +452,7 @@
> repos_root_url, repos_relpath, peg_rev,
> node_kind, pool));
>
> - SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(&repos_relpath,
> + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(&repos_relpath,
> &peg_rev,
> &node_kind,
> conflict,
> ]]]
Thanks.
It looks like a simple copy-paste mistake when the new macros were
introduced in r1687415.
Two more fixes are needed: a similar pattern also appears twice in
svn_cl__append_conflict_info_xml() (see below).
I did *NOT* test the following yet. Also, before committing any fix, I
would like to add a regression test based on the OP's repro script.
[[[
Index: subversion/svn/cl-conflicts.c
===================================================================
--- subversion/svn/cl-conflicts.c (revision 1885712)
+++ subversion/svn/cl-conflicts.c (working copy)
@@ -452,7 +452,7 @@
repos_root_url, repos_relpath, peg_rev,
node_kind, pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(&repos_relpath,
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(&repos_relpath,
&peg_rev,
&node_kind,
conflict,
@@ -529,7 +529,7 @@
repos_root_url,
repos_relpath, peg_rev,
node_kind, scratch_pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(
&repos_relpath, &peg_rev, &node_kind, conflict,
scratch_pool, scratch_pool));
if (repos_root_url && repos_relpath)
@@ -576,7 +576,7 @@
repos_root_url,
repos_relpath, peg_rev,
node_kind, scratch_pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(
&repos_relpath, &peg_rev, &node_kind, conflict,
scratch_pool, scratch_pool));
if (repos_root_url && repos_relpath)
]]]
Cheers,
Nathan
