20

SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don't serve me very well. At the moment I'm using a combination of manual "svn merge" and the graphical diff Meld. Are there better alternatives (non-win32)?

Fabian Buch
  • 831
  • 2
  • 9
  • 18

10 Answers10

11

Meld is arguably one of the best and one of the most used tools for non-win32. On Windows or with Wine WinMerge wins hands down. Some alternatives for Linux:

P.S. Actually on Windows the TortoiseSVN merge tool gives great results too :)

Milan Babuškov
  • 59,775
  • 49
  • 126
  • 179
Ilya Kochetov
  • 17,988
  • 6
  • 44
  • 60
11

I have recently started using the new Beyond Compare 3 (for Windows and Linux). It seems to consistently make better automated merge decisions then TortoiseSVN or KDiff3. Particularly on whitespace, I believe this is due to BC3s better file type configuration.

I also think its merge interface is cleaner and easier to understand then KDiff.

Mike Miller
  • 2,149
  • 1
  • 18
  • 23
3

I figured out how to use SvnMerge, which is a Python script(s), and had quite a lot of success with it. You can google for the instructions I put on my blog, or drop me a line and I'll post the vanity link.

endian
  • 4,234
  • 8
  • 34
  • 42
3

Actually there are reports of people using git-svn or hg-svn bridges to download a tree, preform a merge, then upload the merge. Doesn't solve the messiness part but the increased speed of the merge makes it less tedious.

BubbaT
  • 1,810
  • 4
  • 21
  • 24
2

I really like Sourcegear Diffmerge. http://www.sourcegear.com/diffmerge/

nportelli
  • 3,934
  • 7
  • 37
  • 52
1

We have always used TortoiseSVN on my work. Never had any problem with the merge so I can also recommend it.

user29593
  • 2,425
  • 2
  • 16
  • 6
1

I've used svnmerge and it helps a lot. It's a command line utility, so it may not be the best tool for everyone, but it's good for me.

Mike Akers
  • 12,039
  • 14
  • 58
  • 71
0

Which platform are you running on? On Windows I use TortoiseSVN to carry out most diffs and merges pretty easily. Only some of the more complicated strands of diffs are performed with UltraCompare.

icelava
  • 9,787
  • 7
  • 52
  • 74
0

I have created open source console tool to automate merging process. I think it can helpful for other peoples: Merger
It can:
- Switch subfolders in the folder to the new branch
- Calculate difficulty of the future merge (number of commits/changed files/ commits to the same files, by project)
- Merge revision by revision in auto mode, until no conflicts
- Bulk merge of the groups of projects.
In theory it should be able to work with mono.

Alex H
  • 41
  • 4
0

Best tool I've currently found for Linux is submerge from subcommander package. Here is how to use this and integrate with eclipse.

Lukasz Frankowski
  • 2,955
  • 1
  • 31
  • 32