diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-02-13 13:04:04 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-02-13 13:04:04 +0000 |
| commit | 8f67d37de16f4d4a3c64b754a079789ce8ad1b25 (patch) | |
| tree | f70a7f1a49f2036e84a115da7b6b718d2c702e41 /subversion/svn/cl-conflicts.c | |
| parent | bbee6e0814d5875b85b81f26fd4ca7a28b6f9570 (diff) | |
Diffstat (limited to 'subversion/svn/cl-conflicts.c')
| -rw-r--r-- | subversion/svn/cl-conflicts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subversion/svn/cl-conflicts.c b/subversion/svn/cl-conflicts.c index 0dc0abf29114..24a4607b62b7 100644 --- a/subversion/svn/cl-conflicts.c +++ b/subversion/svn/cl-conflicts.c @@ -452,7 +452,7 @@ append_tree_conflict_info_xml(svn_stringbuf_t *str, 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 @@ svn_cl__append_conflict_info_xml(svn_stringbuf_t *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_stringbuf_t *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) |