Command line interface to IntelliJ internal diff and merge

Hi.

Is there a command line interface to the IntelliJ internal diff and merge
tools?

We have a home grown source control system that has the ability to configure
the diff and merge tools for sync and change operations, and that means that
I can use any tool for merging or viewing differences from the checked in
version, but not the internal IntelliJ tools.

Any help or comment regarding how to do this and also your diff and merge
tools of your choice would be great.


Amnon


5 comments
Comment actions Permalink

Now there is no way to run our diff outside of IDEA. There is a request
http://www.intellij.net/tracker/idea/viewSCR?publicId=15211

--

Dmitry Peshehonov
Software Developer
JetBrains, Inc
http://www.jetbrains.com
"Develop with pleasure!"


"Amnon I. Govrin" <agovrin@freshwater.com> wrote in message
news:c97i4p$jil$1@is.intellij.net...

Hi.

>

Is there a command line interface to the IntelliJ internal diff and merge
tools?

>

We have a home grown source control system that has the ability to

configure

the diff and merge tools for sync and change operations, and that means

that

I can use any tool for merging or viewing differences from the checked in
version, but not the internal IntelliJ tools.

>

Any help or comment regarding how to do this and also your diff and merge
tools of your choice would be great.

>
>

Amnon

>
>


0
Comment actions Permalink

I added a comment there with a basic implementation suggestion that wouldn't
cause any major refactoring or externalizing of the IntelliJ diff and merge
tools.

Does anyone think this can be done externally to JetBrains so that we won't
have to wait?

Amnon


"Dmitry Peshehonov (JetBrains)" <dyoma@intellij.com> wrote in message
news:c97kdc$3dv$1@is.intellij.net...

Now there is no way to run our diff outside of IDEA. There is a request
http://www.intellij.net/tracker/idea/viewSCR?publicId=15211

>

--

>

Dmitry Peshehonov
Software Developer
JetBrains, Inc
http://www.jetbrains.com
"Develop with pleasure!"

>
>

"Amnon I. Govrin" <agovrin@freshwater.com> wrote in message
news:c97i4p$jil$1@is.intellij.net...

Hi.

>

Is there a command line interface to the IntelliJ internal diff and

merge

tools?

>

We have a home grown source control system that has the ability to

configure

the diff and merge tools for sync and change operations, and that means

that

I can use any tool for merging or viewing differences from the checked

in

version, but not the internal IntelliJ tools.

>

Any help or comment regarding how to do this and also your diff and

merge

tools of your choice would be great.

>
>

Amnon

>
>

>
>


0
Comment actions Permalink

Another tool to look at is BeyondCompare. http://www.scootersoftware.com/

"Amnon I. Govrin" <agovrin@freshwater.com> wrote in message
news:c97i4p$jil$1@is.intellij.net...

Hi.

>

Is there a command line interface to the IntelliJ internal diff and merge
tools?

>

We have a home grown source control system that has the ability to

configure

the diff and merge tools for sync and change operations, and that means

that

I can use any tool for merging or viewing differences from the checked in
version, but not the internal IntelliJ tools.

>

Any help or comment regarding how to do this and also your diff and merge
tools of your choice would be great.

>
>

Amnon

>
>


0
Comment actions Permalink

Yeah, we have that in house, and it's pretty good.

But, since we activate the review file and merge through IntelliJ, I would
love having the consistency of behavior, look, code highlighting, etc. that
using the internal tools would provide.

Currently I am using a different diff tool, may be I should switch to Beyond
Compare...

Amnon

"Tim Haley" <ymaraner@yahoo.com> wrote in message
news:c97meb$g84$1@is.intellij.net...

Another tool to look at is BeyondCompare. http://www.scootersoftware.com/

>

"Amnon I. Govrin" <agovrin@freshwater.com> wrote in message
news:c97i4p$jil$1@is.intellij.net...

Hi.

>

Is there a command line interface to the IntelliJ internal diff and

merge

tools?

>

We have a home grown source control system that has the ability to

configure

the diff and merge tools for sync and change operations, and that means

that

I can use any tool for merging or viewing differences from the checked

in

version, but not the internal IntelliJ tools.

>

Any help or comment regarding how to do this and also your diff and

merge

tools of your choice would be great.

>
>

Amnon

>
>

>
>


0
Comment actions Permalink

"Amnon I. Govrin" <agovrin@freshwater.com> wrote in message
news:c97krl$5uf$1@is.intellij.net...> I added a comment there with a basic
implementation suggestion that wouldn't

cause any major refactoring or externalizing of the IntelliJ diff and

merge

tools.

>

Does anyone think this can be done externally to JetBrains so that we

won't

have to wait?


There is no legal way to do it.

--

Dmitry Peshehonov
Software Developer
JetBrains, Inc
http://www.jetbrains.com
"Develop with pleasure!"


0

Please sign in to leave a comment.