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

Re: [TSVN] Quick conflict resoving

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-09-16 10:32:25 CEST

On 9/16/05, Alexander Klenin <klenin@gmail.com> wrote:
> A recent feature when one can resolve conflict directly from the
> 'Switch' dialog (via context menu) is very convinient. Unfortunately,
> it does not work in the similiar 'Merge' dialog.

Both switch and merge dialog don't have context menus at all.
If you're talking about the progress dialog, then the context menu to
resolve conflicts is there for 'merges' too, if of course there's a
conflict after a merge.
If the action is 'merged', then there's no conflict and the menu won't show up.

> Also, it would be nice to have some kind of filter (or at least sort)
> by Action -- it may be hard to find those conflicted files among the
> other messages.

Click on the 'Action' header to sort.

> Finally, how about marking resolved conflict in some way (perhaps
> replacing 'Conflict' with 'Resolved'?)

That dialog is there to show you the result of an operation. It's not
intended to be a replacement for e.g. the check-for-modifications


  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
Received on Fri Sep 16 10:52:50 2005

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