File APIs for Java Developers
Manipulate DOC, XLS, PPT, PDF and many others from your application.
http://aspose.com/file-tools
The moose likes IDEs, Version Control and other tools and the fly likes SVN merge with IntelliJ IDEA Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login
JavaRanch » Java Forums » Engineering » IDEs, Version Control and other tools
Bookmark "SVN merge with IntelliJ IDEA" Watch "SVN merge with IntelliJ IDEA" New topic
Author

SVN merge with IntelliJ IDEA

surlac surlacovich
Ranch Hand

Joined: Mar 12, 2013
Posts: 296

I have IntelliJ IDEA 12.1.3 installed and I have trunk and branch in SVN.
I use IDEA to merge from branch to trunk, and call command Subversion->Integrate Directory.
Source 1 is branch, Source 2 is trunk, unticked "Use ancestry", depth "infinity".
The problem is: it marks files without changes as modified (an shows no differences in "Show Diff").
How would I solve that?
surlac surlacovich
Ranch Hand

Joined: Mar 12, 2013
Posts: 296

Or maybe it is SVN specific problem?
 
I agree. Here's the link: http://aspose.com/file-tools
 
subject: SVN merge with IntelliJ IDEA