[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflicts status/info API and JavaHL

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Mon, 12 Jan 2009 14:48:08 -0500

Mark Phippard wrote:
> We are starting to look at implementing tree conflicts stuff in Subclipse.
>
> Using command line, when you run status you get output like this:
>
> $ svn st
> C MyProject/src/com/test/myproject/builder
> > local edit, incoming delete upon update
> M MyProject/src/com/test/myproject/builder/SampleBuilder.java
>
> The "explanation" shown above - "local edit, incoming delete upon
> update" does not seem to be available to us in JavaHL. Neither via
> the Status or Info2 objects. I also do not see how we could
> programatically determine it from the other information. Is this just
> a case where there is more data in the C API that needs to be exposed
> via JavaHL or something else? How does the command line produce the
> above text?
>

Check out svn_cl__get_human_readable_tree_conflict_description() and
reason_str() in subversion/svn/tree-conflicts.c. Looks to me like
svn_wc_status2_t carries an svn_wc_conflict_description_t with the enums
necessary for revealing this information.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1019880

Received on 2009-01-12 20:48:32 CET

This is an archived mail posted to the Subversion Dev mailing list.