1

I run svn diff and have the content diff result in a text file. Since the operation is slow I don't want to diff again using Eclipse.

I need to view the result in a better manner for comparison, and what I found is Colordiff. I would like to ask are there any plugins in Notepad++ for the same purpose, or are there any plugins in Eclipse to view the diff result with formatting?

(The scenario is I am on a branch which has some core changes and some global replacement. I need to compare this branch with the original. With the help of a script, I filter out some of the global replacement, but still there are too many to check without help from tools.)

creemama
  • 6,129
  • 3
  • 18
  • 25
vincentlcy
  • 959
  • 1
  • 15
  • 19
  • Before I give an answer, could you please explain what "to view the diff result with formatting" means? Do you expect something colorful, where should the diff be formatted and how? – mliebelt May 18 '12 at 18:44
  • yes, like using Colordiff I can load the diff txt result in linux, showing sth colorful or anything similar to eclipse svn compare that can highlight the change, showing one on left and one or right – vincentlcy May 19 '12 at 06:00

3 Answers3

2

You can run git diff ... > foo.diff and open foo.diff in N++. This gives you a similar output like git diff --color in the shell. When you want to have a side-by-side view, you need to set up an external diff tool.

Community
  • 1
  • 1
Rudi
  • 17,566
  • 3
  • 50
  • 74
1

If you are already using Eclipse, you should setup it with an Eclipse plugin for Subversion like Subversive or Subclipse. Both don't color the diff nicely, so if that is the main point, you should add an external diff tool to the definition (here for Subversive):

  • Open Window > Preferences > Team > SVN > Diff Viewer enter image description here
  • Define a new diff entry enter image description here

See the similar answer to a question I have asked in the past about intergration of a merge tool into Eclipse: https://stackoverflow.com/a/7749442/41540

Community
  • 1
  • 1
mliebelt
  • 14,995
  • 7
  • 50
  • 90
0

You didn't mention if you're using any specific GUI tool for your used SCM? In case you're using TortoiseSVN or similar, then here's an approach for you to show diffs inside of Notepad++:

How to use Notepad++ as diff viewer for TortoiseSVN (and similar tools).

ufo
  • 1,552
  • 15
  • 13