subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Näslund <dan...@longitudo.com>
Subject Re: svn commit: r952205 - /subversion/trunk/subversion/libsvn_client/diff.c
Date Mon, 07 Jun 2010 17:44:18 GMT
On Mon, Jun 07, 2010 at 03:33:16PM +0200, Stefan Sperling wrote:
> On Mon, Jun 07, 2010 at 12:43:19PM -0000, dannas@apache.org wrote:
> > +static svn_error_t *
> > +print_git_diff_header_copied(svn_stream_t *os, const char *header_encoding, 
> > +                             const char *path, const char *copyfrom_path,
> > +                             apr_pool_t *result_pool)
> > +{
> > +  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
> > +                                      "diff --git a/%s b/%s%s",
> > +                                      copyfrom_path, path, APR_EOL_STR));
> > +  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
> > +                                      "copy from %s%s", path, APR_EOL_STR));
>                                                ^^^^       ^^^^^
> > +  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
> > +                                      "copy to %s%s", copyfrom_path, 
>                                               ^^^            ^^^^
> > +                                      APR_EOL_STR));
> 
> Shouldn't the copyfrom_path be printed for copy from, and the path for
> copy to?
> 
> > +static svn_error_t *
> > +print_git_diff_header_moved(svn_stream_t *os, const char *header_encoding,
> > +                            const char *path, const char *copyfrom_path,
> > +                            apr_pool_t *result_pool)
> > +{
> > +  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
> > +                                      "diff --git a/%s b/%s%s",
> > +                                      copyfrom_path, path, APR_EOL_STR));
> > +  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
> > +                                      "rename from %s%s", path, 
> > +                                      APR_EOL_STR));
> > +  SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
> > +                                      "rename to %s%s", copyfrom_path, 
> > +                                      APR_EOL_STR));
> 
> Same here.

Doh, fixed in r952344.

Thanks,
Daniel

Mime
View raw message