[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: Alexander Klenin <klenin_at_gmail.com>
Date: 2005-09-16 11:41:39 CEST

On 9/16/05, Stefan Küng <tortoisesvn@gmail.com> wrote:
> 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.
Sorry, I just forgot what they are called -- of course I meant
'progress' dialog.

> 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.
Hm. But it is not there, at least not in r4295.
Surely, I may be just missing something, but I can swear it is not.
Will try the nightly build tomorrow.

> If the action is 'merged', then there's no conflict and the menu won't show up.
Rightfully so.

> > 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.
Ouch, now I really missed that. The reason being that the usual
'up/down' arrow does not appear in the column title, so I just checked
once and assumed that the click does nothing.

> > 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
> dialog.
True, but still it is nice, quick and convinient way to resolve
'uninteresting' conflicts, and I 90% of the conflicts I get are in
this category ;-)

-- 
Alexander S. Klenin
Insight Experts Ltd.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 16 11:42:06 2005

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