On Fri, Nov 21, 2008 at 10:58:20PM +0200, Daniel Shahaf wrote:
> 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?
Apparently we still have a few bugs in tree conflict detection
where missing/deleted/obstructed gets confused. I have a work-in-progress
patch for this, will follow up on it later. Still need to talk to
Julian etc. about the current policy regarding obstructions before
In any case, this does not prevent conflicts from being flagged,
it's just that the notification may be slightly wrong. Not that
big of an issue right now -- though it looks like we're finally
getting to a stage where mostly small cleanups like this one
are left :)
> > 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)?
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 22:17:43 CET