[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 resolving

From: Alexander Klenin <klenin_at_gmail.com>
Date: 2005-10-03 09:08:08 CEST

On 9/16/05, Alexander Klenin <klenin@gmail.com> wrote:
> On 9/16/05, Stefan Küng <tortoisesvn@gmail.com> wrote:
> > 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.
Sorry for a long delay, just did not have time to install and check
nightly build.
However, I have recently installed TortoiseSVN 1.2.4, Build 4479, and
the problem is still there -- namely, progress dialog shown after
'Switch' operation does have context menu with 'Resolve using "mine"'
and 'Resolve using "theirs"' items, while similar dialog shown after
'Merge' operation does not.

Steps to reproduce:
1) Check out a WC.
2) Make some modifications.
3) Merge with other branch so as to produce a conflict.
4) Try right-clicking on 'Conflict' messages in progress dialog.

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 Mon Oct 3 09:08:25 2005

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.