All geek questions in one place

Is it possible to replace the TortoiseSVN merge algorithm with "best"?

Using the merge feature in SVN (via TortoiseSVN ) for several months now, I feel that SVN too often reports a conflict.

So, I'm looking for a way to make (Tortoise) SVN more often resolve conflicts automatically without my user interaction.

I know similar questions and the fact that you can replace the diff viewer and the merge tool with external ones:

enter image description here

In my opinion, these tools linger too late; they are called by SVN / TortoiseSVN when the internal algorithm already detects an unsolvable conflict.

So my questions are:

  • Is my assumption about behavior correct (internal merge algorithm, external merge tools)?
  • Is there a way to improve the internal merge algorithm using (for example, paid) tools?

(I use VisualSVN Server and V1.7 repositories, if that matters)

+6
source share
2 answers

Firstly, it has nothing to do with Tortoise - it's just a very pretty graphical interface on top of the SVN system.

Now, maybe you have a lot of mergers that really need human attention. If so, switching to something like git or Mercurial will not help you for anything - none of them can say what you really mean, just like SVN cannot say.

You can check how SVN performs the merge algorithm by reading the documentation. FYI v1.8 has several approaches to this, which should mean that when making reintegration there is much less manual decision-making - it just does it automatically now, so if you do a special branch style, merge and do it wrong, then it will no longer complain. They are now working on merging for the last two versions, constantly improving it not only with mergeinfo, but also with functions such as moving, so it can say that the file is not new or deleted, therefore merging tree types conflict types.

+1
source

It is difficult to speculate on the context, but the conflicts that will be found are unlikely to have anything to do with TortoiseSVN in particular, and are most suitable only for svn in general. As mvp says, git will be better (heh), but have you looked at the --reintegrate flag to merge? You don’t know how you could use it directly from TortoiseSVN, but it turned out to be very useful for me in reducing conflicts.

Edit View the Advanced Merge tutorial here

+1
source

Source: https://habr.com/ru/post/945570/

More articles:


All Articles