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

Re: svn commit: r952205 - /subversion/trunk/subversion/libsvn_client/diff.c

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Mon, 7 Jun 2010 19:44:18 +0200

On Mon, Jun 07, 2010 at 03:33:16PM +0200, Stefan Sperling wrote:
> On Mon, Jun 07, 2010 at 12:43:19PM -0000, dannas_at_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
Received on 2010-06-07 19:45:02 CEST

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