You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ha...@apache.org on 2021/01/24 16:56:48 UTC
svn commit: r1885883 -
/subversion/branches/issue-4869/subversion/svn/cl-conflicts.c
Author: hartmannathan
Date: Sun Jan 24 16:56:48 2021
New Revision: 1885883
URL: http://svn.apache.org/viewvc?rev=1885883&view=rev
Log:
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().
Modified:
subversion/branches/issue-4869/subversion/svn/cl-conflicts.c
Modified: subversion/branches/issue-4869/subversion/svn/cl-conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-4869/subversion/svn/cl-conflicts.c?rev=1885883&r1=1885882&r2=1885883&view=diff
==============================================================================
--- subversion/branches/issue-4869/subversion/svn/cl-conflicts.c (original)
+++ subversion/branches/issue-4869/subversion/svn/cl-conflicts.c Sun Jan 24 16:56:48 2021
@@ -529,7 +529,7 @@ svn_cl__append_conflict_info_xml(svn_str
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 @@ svn_cl__append_conflict_info_xml(svn_str
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)