Re: [PATCH] Issue 231: Reporting number of skipped files in merge

Tobias Schäfer wrote:

> I have developed the attach patch regarding issue 231: show skipped files when
> merging.
>
> Just a question before I commit:
> I would have liked to add a status row similiar to the one shown when an
> update produces a conflict. Unfortunately SVN::merge doesn't send a
> notification at the end of the merge like SVN::Update does
> ("svn_wc_notify_update_completed"). Do you have any idea how to workaround
> this missing notification?

That's a problem, yes.
But we know when the operation is finished, maybe you can use that
information? You'd have to check of course if there's already an
svn_wc_notify_update_completed message, and only if there isn't add the
custom one.

> What I did do is introduce the color red for skipped targets. This should make
> it pretty obvious during the merge that something is wrong. Ok to commit or
> do you have an idea how to improve it?

Patch looks good. I suggest you commit and maybe improve it (work around
the missing notification) later with another commit.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org