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

Re: svn commit: r34317 - in trunk/subversion: include include/private libsvn_wc svn tests/cmdline

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 21 Nov 2008 22:58:20 +0200 (Jerusalem Standard Time)

stsp_at_tigris.org wrote on Fri, 21 Nov 2008 at 11:25 -0800:
> Author: stsp
> Date: Fri Nov 21 11:24:59 2008
> New Revision: 34317
>
> Log:
> In 'svn status', print an additional line for tree conflict victims,
> describing the nature of the conflict.
>
> It currently looks like this:
>
> $ svn status
> M .
> D C alpha
> > incoming edit, local missing
> M beta
> $

s/D/!/, per your later commit, right?

> Modified: trunk/subversion/include/private/svn_wc_private.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/include/private/svn_wc_private.h?pathrev=34317&r1=34316&r2=34317
> ==============================================================================
> --- trunk/subversion/include/private/svn_wc_private.h Fri Nov 21 09:55:28 2008 (r34316)
> +++ trunk/subversion/include/private/svn_wc_private.h Fri Nov 21 11:24:59 2008 (r34317)
> @@ -218,6 +218,15 @@ svn_wc__read_tree_conflicts(apr_array_he
> const char *dir_path,
> apr_pool_t *pool);
>
> +/** Return a duplicate of @a conflict, allocated in @a pool.
> + * A deep copy of all members, except the adm_access member, will be made.
> + *
> + * @since New in 1.6.
> + */
> +svn_wc_conflict_description_t *
> +svn_wc__conflict_description_dup(const svn_wc_conflict_description_t *conflict,
> + apr_pool_t *pool);
> +

Link to this function from the end of the svn_wc_conflict_description_t
struct (remind to update it when extending it)?

(and I see that you later updated the 'svn help' output...)

Daniel

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-21 21:58:34 CET

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