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

Re: missing conflict dialog?!?

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Wed, 23 Jul 2008 13:16:18 +0100

Dominik Ruf wrote:
> Hi,
>
> I wondered why TortoiseSVN doesn't open a conflict dialog when a
> update leads to a conflict. I think it would be very helpful if a
> dialog would pop up (similar to when you are merging 2 branches) where
> the user can directly resolve the conflict.

If I understand correctly, the dialog you refer to is TSVN's
implementation of this:
http://subversion.tigris.org/svn_1.5_releasenotes.html#interactive-conflict-resolution

(and I'm guessing the main reason this feature exists is that a single
merge can now happen in multiple stages - especially if there are gaps
in the revision range).

There is no such mode of operation for "update", all conflicts are
resolved after the update, not during it. You can launch "edit
conflicts" from the update dialog after the update it finished and you
can sort the file list in this dialog by "action" to group all your
conflicted files together.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-23 14:16:46 CEST

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