On Thu, 2008-10-23 at 10:32 +0200, Neels J. Hofmeyr wrote:
> Hi tree-conflicts folks,
>
> could you please scroll over this and see if you can remotely relate to what
> is going on there? Branch tree-conflicts-notify, r33855.
Good morning, Neels.
I'll take a look. Do you want to join me in IRC #svn-dev?
- Julian
> Particularly, I see that right after calling check_tree_conflict(), I can't
> get the tree-conflict state by doing
> [[[
> /* Find out whether it's a tree conflict victim. */
> if (tree_conflicted_p != NULL)
> {
> svn_wc_conflict_description_t *conflict;
> SVN_ERR_ASSERT(adm_access != NULL);
> path = svn_path_join(dir_path, entry->name, subpool);
> SVN_ERR(svn_wc_get_tree_conflict(&conflict, path, adm_access, subpool));
> *tree_conflicted_p = (conflict != NULL);
> }
> ]]]
> (I try to do that in svn_wc_conflicted_p2(), called from
> subversion/libsvn_wc/update_editor.c, e.g. line 2721 on the branch),
> apparently because the tree-conflict reporting is loggy?
>
> If you guys know how best to get the tree-conflicted state of a node, let me
> know. At the moment I'm making check_tree_conflict() return a value to
> explicitly indicate a conflict to the caller. But it would be nice to have
> svn_wc_conflicted_p2() work as advertised on the branch.
>
> Thanks,
> ~Neels
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-23 10:44:18 CEST