if you rename teh file, it appears correctly as renamed in Changes view don't commit this change rename teh containing folder now: the folder appears as renamed in Changes view, but the above file appears as not-added if you now commit the change, you get the renamed folder with view-private new-named file and checked out but removed old-named file if you don't commit but rolback the change, you get the change list with renamed file, but it cannot be comitted - exception is thrown: No message java.lang.NullPointerException at net.sourceforge.transparent.CCaseCheckinEnvironment.commitChanged(CCaseCheckinEnvironment.java:303) at net.sourceforge.transparent.CCaseCheckinEnvironment.commit(CCaseCheckinEnvironment.java:144) at com.intellij.openapi.vcs.changes.ui.CommitHelper$4.process(CommitHelper.java:9) at com.intellij.openapi.vcs.changes.ChangesUtil.processItemsByVcs(ChangesUtil.java:132) at com.intellij.openapi.vcs.changes.ChangesUtil.processChangesByVcs(ChangesUtil.java:137) at com.intellij.openapi.vcs.changes.ui.CommitHelper.b(CommitHelper.java:38) at com.intellij.openapi.vcs.changes.ui.CommitHelper.access$100(CommitHelper.java:91) at com.intellij.openapi.vcs.changes.ui.CommitHelper$2.run(CommitHelper.java:2) at com.intellij.openapi.vcs.changes.ui.CommitHelper$1.run(CommitHelper.java:3) at com.intellij.openapi.progress.impl.ProgressManagerImpl$4.run(ProgressManagerImpl.java:3) at com.intellij.openapi.progress.impl.ProgressManagerImpl$5.run(ProgressManagerImpl.java:0) at com.intellij.openapi.progress.impl.ProgressManagerImpl$2.run(ProgressManagerImpl.java:3) at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:4) at com.intellij.openapi.progress.impl.ProgressManagerImpl.runProcess(ProgressManagerImpl.java:86) at com.intellij.openapi.progress.impl.ProgressManagerImpl$6.run(ProgressManagerImpl.java:7) at com.intellij.openapi.application.impl.ApplicationImpl$4.run(ApplicationImpl.java:6) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:417) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:269) at java.util.concurrent.FutureTask.run(FutureTask.java:123) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:650) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:675) at java.lang.Thread.run(Thread.java:595) at com.intellij.openapi.application.impl.ApplicationImpl$1$1.run(ApplicationImpl.java:8)