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:54:42 UTC
svn commit: r1885882 -
/subversion/branches/issue-4869/subversion/svn/cl-conflicts.c
Author: hartmannathan
Date: Sun Jan 24 16:54:42 2021
New Revision: 1885882
URL: http://svn.apache.org/viewvc?rev=1885882&view=rev
Log:
branches/issue-4869: Fix 'svn info --xml' for the tree conflict case
* subversion/svn/cl-conflicts.c:
(append_tree_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 svn_client_conflict_get_incoming_old_repos_location() to
svn_client_conflict_get_incoming_new_repos_location().
Patch by: futatuki
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=1885882&r1=1885881&r2=1885882&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:54:42 2021
@@ -452,7 +452,7 @@ append_tree_conflict_info_xml(svn_string
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,