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

Re: svn commit: r33602 - trunk/subversion/libsvn_client

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Sun, 12 Oct 2008 14:59:47 +0100

On Sun, 2008-10-12 at 03:48 -0700, rhuijben_at_tigris.org wrote:
> Author: rhuijben
> Date: Sun Oct 12 03:48:03 2008
> New Revision: 33602
>
> Log:
> Stop sleeping after each individual merge when batching several merges in
> a single command (Cherry picking)

Bert, this sounds like a great improvement.

> Implement this by passing a svn_boolean_t* use_sleep to all function that
> require a sleep for timestamp integrity. The calling function will then call
> svn_sleep_for_timestamps() when use_sleep is set to TRUE.

In the implementation, notice that many of our functions have far too
many arguments for a human mind to keep track of already. Instead of
passing another argument, would it be better to put the "needs sleep"
variable in the merge command baton which appears to be already passed
around to the required places?

(I see places where the baton is named "merge_options", and that name
would then want to be improved because it would no longer contain just
options, but that's not a problem.)

- Julian

> * subversion/libsvn_client/merge.c
> (drive_merge_report_editor, do_file_merge): Add use_sleep parameter and set
> its value to TRUE instead of calling svn_sleep_for_timestamps().
> (do_directory_merge, do_merge, merge_cousins_and_supplement_mergeinfo):
> Add use_sleep parameter and pass it to functions now requiring this
> parameter.
> (svn_client_merge3, svn_client_merge_reintegrate, svn_client_merge_peg3):
> Pass use_sleep parameters to functions and call svn_sleep_for_timestamps() if
> this value is TRUE. Also check for use_sleep if the function returns
> an error.

---------------------------------------------------------------------
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-12 16:00:04 CEST

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