[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: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 13 Jan 2009 00:51:31 +0000

On Mon, Jan 12, 2009 at 02:59:16PM -0500, Mark Phippard wrote:
> On Mon, Jan 12, 2009 at 2:48 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> > 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.
>
> Thanks. We have this class which looks like it has all the right values:
>
> http://svn.collab.net/repos/svn/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
>
> So I will look at adding a method to turn those values into a string
> (assuming I come up with a place in the UI where I want to show this).

The initial plan was to have the libraries provide human-readable strings
that all clients could print. Stefan Küng said he'd rather want access to the
raw conflict description struct instead, to make up his own way of
presenting this data in TortoiseSVN. So we did that instead.

So yes, svn_wc_conflict_description_t it is, you're on the right track.
You can make up your own way to present the information in a GUI.

IMHO GUI developers should try to go crazy and draw graphs, trees, nodes,
and whatever funky graphics required to illustrate tree conflicts graphically.
We cannot do this in the CLI client (short of outputting .ps files, maybe :)
And the more arty, the better ;)
Have fun!

Stefan
Received on 2009-01-13 01:52:03 CET

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