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

Tree conflicts status/info API and JavaHL

From: Mark Phippard <mphippard_at_collab.net>
Date: Mon, 12 Jan 2009 14:39:50 -0500

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?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2009-01-12 20:40:36 CET

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