Diffing svn history changesets with local not working in IDEA 2016.2.3?

Answered

After looking at the subversion change history for a class I needed to revert some changes.

So I brought up svn log history and clicked show affected files to show the whole changeset on the problem revision. But when I diff classes from this affected files dialog with local copies it isn't correct. Instead of showing the diff between local and the affected revision it only shows changes made to the local to HEAD (often says no changes). If I double click the classes in the affected dialog it correctly shows the diff between the two svn revisions, but both of these views are uneditable. I wanted to apply the old diffs back to local? 

Can't revert as there's a bunch of changesets after this revision, only want to revert parts of this revision.

6 comments
Comment actions Permalink

Actually doesn't happen for me.

Is there any difference if you diff directly from History, without going to All affected files?

And if you Diff the same revision from Repository tab? 

0
Comment actions Permalink

Hmmm now I'm seeing a different result. Comparing diff directly from class vcs history looks OK. But not much help for reverting related api calls across a whole changeset.

When I try with show all affected files now the 'show diff with local' menu item is disabled? The files still exist in the same location in HEAD (open in editor) I can't see any reason a diff would not be possible?

It will show diff with local from the direct svn history, but show affected files diff with local on the same class and revision and it is disabled.

0
Comment actions Permalink

I'll try invalidating caches, but I'm pretty sure the update to 2016.2.3 this morning already did this? had to wait 10 mins for re-indexing (1.5gb project)

Also have other problems with the svn support like https://youtrack.jetbrains.com/issue/IDEA-159045 still very much an issue for me.

0
Comment actions Permalink

If you updated from 16.2.2 to 16.2.3, this is not a major update and should not invalidate cache upon installation.

I actually was not able to reproduce the behavior.

What looks strange for me is that  the file path on screenshot point to server, while I would expect this to be a local path, at least for me it is always a file in my Working copy.

I get the same if I use Browse SVN repository option while the actual project pointing to SVN working copy is not opened.

What is your project structure, actually? Are there several working copies from different repos in it? Maybe something else specific?

Make sure the Subversion working copies tab show correct information and lists the repo you are working with.

0
Comment actions Permalink

>What looks strange for me is that  the file path on screenshot point to server, while I would expect this to be a local path, at least for me it is always a file in my Working copy.

Do you mean the svn:/svn.mango.local/.... bit? This is the dialog from 'show affected files' from an 'show history' revision.

The file in the editor is the local copy otherwise I'm peeking back into the repo history. It's just one repo, actually one repo per project as it's huge, but it's not changed for 3 years now, longer before these revisions which are within last few weeks.

>I get the same if I use Browse SVN repository option while the actual project pointing to SVN working copy is not opened.

The project is opened and vcs attached. However I cannot use the keyring or a persistent svn auth session (remember me)  as IDEA-159045 keeps killing the IDE JVM. I have to enter my VCS credentials password every time I open the project and every few hours after (whenever I access svn). Its the only way I can work with IDEA at the moment.

0
Comment actions Permalink

Looks like IDEA cannot map files in project with working directory or something.

If switching to command line as proposed in IDEA-159045 doesn't help, please submit a new bug at and attach full IDEA log.

0

Please sign in to leave a comment.