Is there a keyboard shortcut to revert individual changes to Intellij IDEA?

Question

When a file has changes compared to the version from the version control system (subversion and cvs in my case), I use Ctrl + Alt + Shift + ↑ / Ctrl + Alt + Shift + ↓ to switch between these changes. Sometimes I want to undo some of these changes (but not all changes in the file). I can do this using the mouse and clicking the small return icon with a green arrow, but is there a way to do this from the keyboard (without using the mouse)?

I am using IntelliJ IDEA 7.0.3.

Answer 1

You need to assign a hotkey for the Rollback action in Settings | Keymap, it is not assigned by default.

UPDATE: it looks like the Rollback action actually calls Revert for the whole file. I sent IDEA-26912 for this, please see / vote.

Answer 2

You can set Settings | Keymap and select Version Control Systems in the list of keyboard layouts and set a shortcut, but the revert parameter in my subversion settings is set to the default value: Ctrl + Alt + Z

Answer 3

Rollback no longer returns the entire file and can be assigned a key combination. See this comment . Tested in IntelliJ IDEA 12.1.6 Ultimate.