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

Color of skipped files in merge is a usability problem

From: Paulo Eduardo Neves <pauloneves_at_gmail.com>
Date: Fri, 26 Sep 2008 14:04:17 -0700 (PDT)

When we do a merge and the branch added a file that is already present
in my work copy, the merge is skipped. The action is correct, but the
color of the action/path list in the merge dialog is bugging me.

I'm responsible to review and merge the changes from our development
branch to our production branch. Here is the work flow that gets me in

1) Merge a bunch of revisions to my work copy.
2) Spot a problem and tell someone to fix it.
3) Revert the work copy. Now the added files are still there but out
of version control.
4) Transfer other revisions from the development to the production
5) The developer fix the problem and I merge again the old revisions
and the new one to my work copy.

Now I have a problem. Since there's already a file in my work copy,
when I try to merge, the add file action is skipped. The skipped
message is in the middle of dozens of other messages and I don't see

I merge the revised copy and a file is missing. Our production branch
is broken.

I'd like to be able to set as bright red the color of the "Skipped"
action. Like the "Skipped missing target". It is always an error for

kind regards,
Paulo Eduardo Neves

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-26 23:13:39 CEST

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