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

Re: pause on merge conflict - is it a setting?

From: Stefan Hett <stefan_at_egosoft.com>
Date: Mon, 5 Dec 2016 07:35:04 +0100

On 12/2/2016 6:04 PM, Mike Konikoff wrote:
> When merging, the dialog used to pause and let me resolve conflicts as
> they were encountered. With latest version, it continues merging, only
> allowing me to resolve conflicts at the end of the merge. If there are
> many conflicts over multiple revisions, it eventually aborts and says
> I need to resolve the conflicts and re-merge. How can I get the old
> behavior back, it is my strong preference.
> Thanks,
> Mike
Did you run TSVN <= 1.7 before and upgraded to TSVN >= 1.8? If so, this
change is intended/expected as far as I know, so that your connection to
the server is not kept open during the interactive resolution which
could cause a time out. See SVN issue 3846:

In this case there's no way to change back to the old behavior, as far
as I know.

Note that the abort of the merge only occurs when you do not resolve one
of the conflicts (which is unchanged behavior to how it was before, to
my knowledge; only now you end up with everything being merged and
everything you skipped would be unmerged while before you would have
half the revision merged upon the user abort). Also I can't think of any
reason why the old behavior would be better than the new one. I mean: In
both cases you need to resolve all conflicts. The new behavior only has
the advantage that your connection to the server is not kept alive for
as long as you try to resolve the conflict.

Stefan Hett
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-12-05 07:35:15 CET

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