branches/issue-4869: Fix 'svn info --xml' for text and prop conflict cases
* subversion/svn/cl-conflicts.c:
(svn_cl__append_conflict_info_xml): Was getting old repos location for both
left and right sides of conflict. Left side was correct. Fix right side
by changing 2 svn_client_conflict_get_incoming_old_repos_location() calls
to svn_client_conflict_get_incoming_new_repos_location().
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-4869@1885883 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/svn/cl-conflicts.c b/subversion/svn/cl-conflicts.c
index 634efb9..24a4607 100644
--- a/subversion/svn/cl-conflicts.c
+++ b/subversion/svn/cl-conflicts.c
@@ -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)
