I sometimes have a need to compare a specific file between the trunk of my SVN tree, and another branch of the same code using IntelliJ's built in difference viewer. But I always struggle to set it up correctly. Here is the rundown:
My tree is structured like:
Base -> Client -> Project -> trunk -> src
-> branches -> branch1 -> src
-> branch2 -> src
-> branch3 -> src
to compare a file, say src -> com -> package -> File.java
between trunk
and branch2
, you would do this:
File.java
Under trunk location, specify the path as:
Base -> Client -> Project -> trunk
Click Add... and locate the branch branch2, once selected it will appear in the branch locations list as:
Base -> Client -> Project -> branches
Click Ok.
branch2
.