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

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

From: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: 2006-03-04 11:52:05 CET

Hi Stefan,

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?

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?

[[[
Merging now shows the number of skipped targets. See issue #231 for details.
]]]

Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Sat Mar 4 11:54:26 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.