You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/02/02 11:03:28 UTC
svn commit: r905561 - /subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Author: julianfoad
Date: Tue Feb 2 10:03:27 2010
New Revision: 905561
URL: http://svn.apache.org/viewvc?rev=905561&view=rev
Log:
Update the 'svnraisetreeconflict' tool to compile against the current
libsvn_wc private API.
* tools/dev/svnraisetreeconflict/main.c
(raise_tree_conflict): Use 'svn_wc_context_t' instead of
'svn_wc_adm_access_t', and svn_wc_conflict_description_create_tree2()
instead of svn_wc_conflict_description_create_tree().
Modified:
subversion/trunk/tools/dev/svnraisetreeconflict/main.c
Modified: subversion/trunk/tools/dev/svnraisetreeconflict/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnraisetreeconflict/main.c?rev=905561&r1=905560&r2=905561&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnraisetreeconflict/main.c (original)
+++ subversion/trunk/tools/dev/svnraisetreeconflict/main.c Tue Feb 2 10:03:27 2010
@@ -185,11 +185,12 @@
{
int i = 0;
svn_wc_conflict_version_t *left, *right;
- svn_wc_conflict_description_t *c;
- svn_wc_adm_access_t *adm_access;
+ svn_wc_conflict_description2_t *c;
+ svn_wc_context_t *wc_ctx;
/* Conflict description parameters */
- const char *wc_path, *repos_url1, *repos_url2, *path_in_repos1, *path_in_repos2;
+ const char *wc_path, *wc_abspath;
+ const char *repos_url1, *repos_url2, *path_in_repos1, *path_in_repos2;
int operation, action, reason;
int peg_rev1, peg_rev2;
int kind, kind1, kind2;
@@ -215,26 +216,19 @@
/* Allocate and fill in the description data structures */
+ SVN_ERR(svn_dirent_get_absolute(&wc_abspath, wc_path, pool));
left = svn_wc_conflict_version_create(repos_url1, path_in_repos1, peg_rev1,
kind1, pool);
right = svn_wc_conflict_version_create(repos_url2, path_in_repos2, peg_rev2,
kind2, pool);
- c = svn_wc_conflict_description_create_tree(wc_path, NULL, kind,
+ c = svn_wc_conflict_description_create_tree2(wc_abspath, kind,
operation, left, right, pool);
c->action = (svn_wc_conflict_action_t)action;
c->reason = (svn_wc_conflict_reason_t)reason;
/* Raise the conflict */
- {
- const char *parent_path;
-
- parent_path = svn_path_dirname(wc_path, pool);
- SVN_ERR(svn_wc_adm_open3(&adm_access, NULL, parent_path, TRUE, 0,
- NULL, NULL, pool));
- }
-
- /* Raise the conflict */
- SVN_ERR(svn_wc__add_tree_conflict(c, adm_access, pool));
+ SVN_ERR(svn_wc_context_create(&wc_ctx, NULL, pool, pool));
+ SVN_ERR(svn_wc__add_tree_conflict(wc_ctx, c, pool));
return SVN_NO_ERROR;
}