On Tue, Feb 8, 2011 at 1:28 PM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> I ran into this while trying to 'svn up' today, and managed to reproduce
> it in another working copy:
>
> % svn revert -R .
> % cat ./before
> Index: subversion/include/svn_diff.h
> ===================================================================
> --- subversion/include/svn_diff.h (revision 1067829)
> +++ subversion/include/svn_diff.h (working copy)
> @@ -198,7 +198,7 @@
> svn_error_t *
> svn_diff_diff_2(svn_diff_t **diff,
> void *diff_baton,
> - const svn_diff_fns2_t *diff_fns,
> + const svn_diff_fns2_t *diff_fns2,
> apr_pool_t *pool);
>
> /** Given a vtable of @a diff_fns/@a diff_baton for reading datasources,
> @@ -224,7 +224,7 @@
> svn_error_t *
> svn_diff_diff3_2(svn_diff_t **diff,
> void *diff_baton,
> - const svn_diff_fns2_t *diff_fns,
> + const svn_diff_fns2_t *diff_fns2,
> apr_pool_t *pool);
>
> /** Given a vtable of @a diff_fns/@a diff_baton for reading datasources,
> @@ -252,7 +252,7 @@
> svn_error_t *
> svn_diff_diff4_2(svn_diff_t **diff,
> void *diff_baton,
> - const svn_diff_fns2_t *diff_fns,
> + const svn_diff_fns2_t *diff_fns2,
> apr_pool_t *pool);
>
> /** Given a vtable of @a diff_fns/@a diff_baton for reading datasources,
> % patch -p0 < ./before
> % svn up -q subversion/include/
> % cat -n subversion/include/svn_diff.h | tail
> 296 * Differences, similarities, and conflicts are described by lining up
> 297 * "ranges" of data.
> 298 *
> 299 * @note These callbacks describe data ranges in units of "tokens".
> 300 * A "token" is whatever you've defined it to be in your datasource
> 301 * @c svn_diff_fns_t vtable.
> 302 */
> 303 typedef struct svn_diff_output_fns_t
> 304 {
> 305 /* Two-way and three-way diffs both call the first two output functions: */
> %
Wow, weird. I can reproduce it too. I'm looking into it.
Cheers,
--
Johan
Received on 2011-02-08 21:02:43 CET