External Diff Tool Support in 915

IntelliJ 3.0.5 allows me to use an external diff tool before committing changes to CVS.

I hope that this feature will be added back to Aurora soon!

Thanks,

FS

18 comments
Comment actions Permalink

What external diff you're using and what functionality from there is missing
in IDEA's internal one?

--

Best regards,
Maxim Shafirov
JetBrains, Inc / IntelliJ Software
http://www.intellij.com
"Develop with pleasure!"


"Fred Smith" <allspamgone@yahoo.com> wrote in message
news:26719478.1062513466940.JavaMail.itn@is.intellij.net...

IntelliJ 3.0.5 allows me to use an external diff tool before committing

changes to CVS.
>

I hope that this feature will be added back to Aurora soon!

>

Thanks,

>

FS



0
Comment actions Permalink

I use BeyondCompare. The things I use it for is, and some of these may be the intellij one

1. Ignore unimportant difference, like comments, white space ect.

2. Print difference reports in color coded html file. We use this for code reviews.

I have submitted a request to make intellij's diff tool smarter. You can vote for it


http://www.intellij.net/tracker/idea/viewSCR?publicId=11430

0
Comment actions Permalink

I also posted some comments about nice BC features to this discussion:
http://www.intellij.net/forums/thread.jsp?forum=33&thread=38241

0
Comment actions Permalink

I think it is great the JetBrains has implemented their own diff tool!

I think it sucks that JetBrains has taken away functionality that allowed me to choose my favorite diff tool.

I am curious- what is the reasoning behind removing this functionality?

0
Comment actions Permalink

Araxis merge is just a great merge tool. It is able to distinguish between 'real' changes and text being moved around very very well.

I have yet to see any tool that comes close.

0
Comment actions Permalink

I just played with araxis a little. Looks nice, and three-way merge thing is cool. Although it doesn't seem much better than BC and determining related areas.

The one thing I really don't like about it and about idea is the "sliding sides". Do most people really prefer sides which slide around to show places where lines were inserted or deleted, rather than just filling in the missing lines with some kind of empty marker or cross hatches? Mayby I'm just used to it, but it seems so much easier to view when the two sides aren't moving around at different speeds. And it gets rid of that big space in between the two files.

0
Comment actions Permalink

if you want to see the diff tool get smarter then add your comments to the request and VOTE :)

http://www.intellij.net/tracker/idea/viewSCR?publicId=11430

0
Comment actions Permalink

I would like the diff tool to get 'smarter' but I would also like to have the external diff feature back.

Since when do we remove useful features from software?

Anyone from IntelliJ care to comment on this?

FS

0
Comment actions Permalink

Anyone from IntelliJ care to comment on this?

0
Comment actions Permalink

Perhaps you should add a feature request. I'd vote for it.

0
Comment actions Permalink

Here are some important features missing from the IntelliJ diff tool:

  • Does not have the 'smarts' that other tools such as Araxis Merge has to handle code that was rearranged

  • unable to edit the files that I am comparing

  • unable to save the files that I am comparing to a temporary location

  • Unable to load a different (external to the project) file for comparison


Why prevent users from using an external diff tool of their choosing?

0
Comment actions Permalink

More importantly, this tool is not a true 'MERGE' tool, because I cannot use it to 'merge', only to compare the differences.

The merege part is very important because it allows me to compare my current source to CVS, and roll-back whichever changes I want.

0
Comment actions Permalink

add these comments to the request for making the diff tool smart...and then vote for it


http://www.intellij.net/tracker/idea/viewSCR?publicId=11430

0
Comment actions Permalink

To be fair, they are in the process of implementing editting within the diff panel. Select two files, and try "Merge". It's not done yet, but it looks ok.

Also, I don't think the "I can't compare to files external to the project" is a valid argument. Either idea lets you select files outside your project to compare, in which case in doesn't matter whether you're using the internal or the external diff tool, or it doesn't, in which case you have to just open the two files in your external diff tool anyway.

0
Comment actions Permalink

Fixed in #918.

--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com

"Develop with pleasure!"

"Fred Smith" <allspamgone@yahoo.com> wrote in message
news:26719478.1062513466940.JavaMail.itn@is.intellij.net...

IntelliJ 3.0.5 allows me to use an external diff tool before committing

changes to CVS.
>

I hope that this feature will be added back to Aurora soon!

>

Thanks,

>

FS



0
Comment actions Permalink

I'm also a lot happier with BC's way of doing it. So I really hope IDEA will get back the possibility of calling an external program for diffing.

By the way, did you know that BC will get filter functionality in the next release? That is, you can for example run a decompiler on class-files before comparing them and run a compiler after doing changes on the java file.

0
Comment actions Permalink

Since when do we remove useful features from
software?


They might have removed it temporarily to get feedback. Otherwise, many of you will be using other tools. EAP users are are now forced to use IDEA's diff and you will hopefully file many requests as a result.

IMHO, this is fair for EAP.

0

Please sign in to leave a comment.