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

Re: svn commit: r31511 - in branches/tree-conflicts: . subversion/include subversion/libsvn_wc subversion/svn subversion/tests/libsvn_wc

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 29 May 2008 13:22:11 +0200

On Thu, May 29, 2008 at 03:57:50AM -0700, julianfoad_at_tigris.org wrote:
> Author: julianfoad
> Date: Thu May 29 03:57:50 2008
> New Revision: 31511
>
> Log:
> Move the code that generates human-readable and XML descriptions of tree
> conflicts up from libsvn_wc to the client, as libsvn_wc need not know how
> this information should be presented to the users.
>
> * subversion/include/svn_wc.h
> (svn_wc_conflicted_p2): Add some to-do comments and questions to the doc
> string.
> (svn_wc_append_human_readable_tree_conflict_description,
> svn_wc_append_tree_conflict_info_xml):
> Move to subversion/svn/tree-conflicts.h, changing the prefix svn_wc_ to
> svn_cl__.

The functions where public before, and now they aren't. Why that?
Are you going to add another public API that calls these, or
is there already an equivalent public API in libsvn_client?
 
> * subversion/svn/tree-conflicts.c,
> subversion/svn/tree-conflicts.h
> New files with content moved out of libsvn_wc.
> (svn_cl__append_tree_conflict_info_xml): Tweak to hard-code the XML element
> and attribute names ("dir", "file", "merge", "deleted", etc.) instead of
> using the words defined to be used in the WC entries file format.

Mmmh. I'd like it much better if there was a single place where these
are defined. Oh well, I guess they won't change anymore in the life time
of libsvn_wc-1 anyway.

> * subversion/tests/libsvn_wc/tree-conflict-human-readable-test.c
> Delete this file, as human-readable descriptions are no longer in libsvn_wc.
> (I don't feel it's worth transferring these tests to the replacement
> functions.)

OK, given that you wanted to change that output anyway.

Stefan

  • application/pgp-signature attachment: stored
Received on 2008-05-29 13:20:41 CEST

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