Re: svn commit: r33784 - trunk/subversion/svn

On Mon, Oct 20, 2008 at 10:21:11PM +0200, Bert Huijben wrote:
> > -----Original Message-----
> > New Revision: 33784
> >
> > Log:
> > * subversion/svn/notify.c
> > (print_conflict_stats): Fix an indentation error in printed output.
 
> After this commit it is:
> >>>
> Skipped 'A\D\G2\tau'
> --- Merging r2 into 'A\D\G2':
> C A\D\G2
> Summary of conflicts:
> Tree conflicts: 1
> Skipped paths: 1
> <<<
>
> Maybe this was the intended output after all?

No, it wasn't. There are other possible conflict states
("Text conflicts:", "Property conflicts:") which have a different
length. So the colon will not be aligned.

> Otherwise merge_tests.py should be fixed.

Yep. Please do so.

Jens

---------------------------------------------------------------------
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-21 10:35:08 CEST