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

Re: [PATCH] print conflict statistics after update/merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 18 Oct 2008 16:04:16 +0100

On Fri, Oct 17, 2008 at 08:14:23PM +0200, Daniel Shahaf wrote:
> Stefan Sperling wrote on Fri, 17 Oct 2008 at 18:40 +0100:
> > On Fri, Oct 17, 2008 at 05:57:30PM +0200, Daniel Shahaf wrote:
> > > > @@ -305,7 +429,13 @@ notify(void *baton, const svn_wc_notify_t *n, apr_
> > > > }
> > > > }
> > > > }
> > > > + if ((err = print_conflict_stats(nb, pool)))
> > > > + goto print_error;
> > > > + /* Reset conflict stats. */
> > > > + nb->text_conflicts = nb->prop_conflicts = nb->tree_conflicts
> > > > + = nb->skipped_paths = 0;
> > > > }
> > > > +
> > >
> > > This is the block of svn_wc_notify_update_completed. Its docstring says
> > > it also fires for externals. Have you tested with externals?
> >
> > No. But can externals, by definition, have conflicts?
>
> Yes:
>
> % svn ps svn:externals "^/trunk/A A2" .
> property 'svn:externals' set on '.'
>
> % svn up
>
> Fetching external item into 'A2'
> A A2\B
> A A2\B\lambda
> A A2\B\E
> A A2\B\E\alpha
> A A2\B\E\beta
> A A2\B\F
> A A2\mu
> A A2\C
> A A2\D
> A A2\D\gamma
> A A2\D\G
> A A2\D\G\pi
> A A2\D\G\rho
> A A2\D\G\tau
> A A2\D\H
> A A2\D\H\chi
> A A2\D\H\omega
> A A2\D\H\psi
> Updated external to revision 1.
>
> Updated to revision 1.
>
> % cd A2
>
> % svn rm mu
> D mu
>
> % cd..
>
> % echo foo >> A\mu
>
> % svn ci A -mr2
> Sending A\mu
> Transmitting file data .
> Committed revision 2.
>
> % svn up
>
> Fetching external item into 'A2'
> U A2\mu
> C A2
> Updated external to revision 2.
>
> Updated to revision 2.
>
> %
>
>

Conflict stats for externals seem to work fine:

  stsp_at_jack [svn-sandbox/trunk] trunk-power $ svn ps svn:externals '\^/trunk/gamma ext' .
  property 'svn:externals' set on '.'
  stsp_at_jack [svn-sandbox/trunk] trunk-power $ svn up
  
  Fetching external item into 'ext'
  A ext/delta
  Updated external to revision 2.
  
  Updated to revision 2.
  stsp_at_jack [svn-sandbox/trunk] trunk-power $ cd ext
  stsp_at_jack [trunk/ext] trunk-power $ svn rm delta
  D delta
  stsp_at_jack [trunk/ext] trunk-power $ cd ..
  stsp_at_jack [svn-sandbox/trunk] trunk-power $ echo foo > gamma/delta
  stsp_at_jack [svn-sandbox/trunk] trunk-power $ svn ci -mm
  Sending .
  Sending gamma/delta
  Transmitting file data .
  Committed revision 3.
  stsp_at_jack [svn-sandbox/trunk] trunk-power $ svn up
  
  Fetching external item into 'ext'
  U ext/delta
  C ext
  Updated external to revision 3.
  Summary of conflicts:
    Tree conflicts: 1
  
  Updated to revision 3.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-18 17:04:37 CEST

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