> -----Original Message-----
> From: stsp_at_tigris.org [mailto:stsp_at_tigris.org]
> Sent: Monday, October 20, 2008 8:26 PM
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r33784 - trunk/subversion/svn
>
> Author: stsp
> Date: Mon Oct 20 11:25:51 2008
> New Revision: 33784
>
> Log:
> * subversion/svn/notify.c
> (print_conflict_stats): Fix an indentation error in printed output.
>
> Patch by: Jens Seidel <jensseidel_at_users.sf.net>
> (tweaked by me)
Before this commit the output of merge test 103 was:
>>>
Skipped 'A\D\G2\tau'
--- Merging r2 into 'A\D\G2':
C A\D\G2
Summary of conflicts:
Tree conflicts: 1
Skipped paths: 1
<<<
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?
Otherwise merge_tests.py should be fixed.
Thanks,
Bert
>
> Modified:
> trunk/subversion/svn/notify.c
>
> Modified: trunk/subversion/svn/notify.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/svn/notify.c?pathrev=
> 33784&r1=33783&r2=33784
> =======================================================================
> =======
> --- trunk/subversion/svn/notify.c Mon Oct 20 09:13:10 2008
> (r33783)
> +++ trunk/subversion/svn/notify.c Mon Oct 20 11:25:51 2008
> (r33784)
> @@ -107,7 +107,7 @@ print_conflict_stats(struct notify_baton
>
> if (skipped_paths > 0)
> SVN_ERR(svn_cmdline_printf
> - (pool,_(" Skipped paths: %u\n"), skipped_paths));
> + (pool, _(" Skipped paths: %u\n"), skipped_paths));
>
> return SVN_NO_ERROR;
> }
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
---------------------------------------------------------------------
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-20 22:21:36 CEST