I'm probably as guilty of this as anyone else, but:
Let's try to be careful of unrelated whitespace cleanups creeping into
non-cleanup commits. I was merging a big range of revisions into the
incomplete-directories branch today, and stumbled over r22331. It
turned out that invisible whitespace tweaks (see hunk below) caused
needless conflicts. Ideally, the whitespace tweaks wouldn't have been
in r22331 in the first place; the next best thing would be for the log
message to at least mention them :-).
This is not a complaint about r22331 overall, of course -- it's a
great change, it's just that combining whitespace tweaks with a real
change can slow down those who have to puzzle things out later.
-Karl, back in the saddle after a lovely six-week vacation
> --- trunk/subversion/libsvn_ra_local/ra_plugin.c (original)
> +++ trunk/subversion/libsvn_ra_local/ra_plugin.c Fri Nov 17 15:27:06 2006
> @@ -596,24 +596,33 @@
> *reporter = &ra_local_reporter;
>
> SVN_ERR(get_username(session, pool));
> -
> +
> + if (sbaton->callbacks)
> + SVN_ERR(svn_delta_get_cancellation_editor(sbaton->callbacks->cancel_func,
> + sbaton->callback_baton,
> + editor,
> + edit_baton,
> + &editor,
> + &edit_baton,
> + pool));
> +
> /* Build a reporter baton. */
> SVN_ERR(svn_repos_begin_report(&rbaton,
> revision,
> sbaton->username,
> - sbaton->repos,
> + sbaton->repos,
> sbaton->fs_path->data,
> - target,
> + target,
> other_fs_path,
> text_deltas,
> recurse,
> ignore_ancestry,
> - editor,
> + editor,
> edit_baton,
> NULL,
> NULL,
> pool));
> -
> +
> /* Wrap the report baton given us by the repos layer with our own
> reporter baton. */
> *report_baton = make_reporter_baton(sbaton, rbaton, pool);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 15 04:26:04 2007