You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Erik Huelsmann <eh...@gmail.com> on 2006/07/01 09:10:31 UTC
Re: [PATCH] Fix issue 1914: Update runs diff3 twice
More digging turned up ...
On 7/1/06, Erik Huelsmann <eh...@gmail.com> wrote:
> For performance and correctness reasons, I think we should stop
> running merge twice in update/switch.
>
> In the past, arguments were made that we don't run the actual
> (possibly interactive) diff3 in the middle of a network connection to
> be sure that the network doesn't time out. After I started
> investigating this issue last week, I found
>
> * That we actually run the external (possibly interactive) diff3 in
> the close_directory phase of the editor drive, which is as much 'in
> the middle of the connection' as close_file is (from which merge_file
> is called).
... that jpieper added the dry-run merge in r9868 to be able to do
per-file progress reporting when he switched libsvn_wc from per-file
to per-directory log running (to make libsvn_wc more efficient at
entries rewriting).
My change enables per-file progress reporting while still doing
per-directory log-running without a dry-run. So, I guess it's OK to
commit, apart from any other comments...
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix issue 1914: Update runs diff3 twice
Posted by Erik Huelsmann <eh...@gmail.com>.
On 7/1/06, Erik Huelsmann <eh...@gmail.com> wrote:
> More digging turned up ...
>
> On 7/1/06, Erik Huelsmann <eh...@gmail.com> wrote:
> > For performance and correctness reasons, I think we should stop
> > running merge twice in update/switch.
> >
> > In the past, arguments were made that we don't run the actual
> > (possibly interactive) diff3 in the middle of a network connection to
> > be sure that the network doesn't time out. After I started
> > investigating this issue last week, I found
> >
> > * That we actually run the external (possibly interactive) diff3 in
> > the close_directory phase of the editor drive, which is as much 'in
> > the middle of the connection' as close_file is (from which merge_file
> > is called).
>
> ... that jpieper added the dry-run merge in r9868 to be able to do
> per-file progress reporting when he switched libsvn_wc from per-file
> to per-directory log running (to make libsvn_wc more efficient at
> entries rewriting).
>
> My change enables per-file progress reporting while still doing
> per-directory log-running without a dry-run. So, I guess it's OK to
> commit, apart from any other comments...
Committed in r20340.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org