From d95b4221596035c6f49828ef8e54c8d04e8216e0 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 12 Dec 2012 12:49:46 +0400 Subject: [PATCH] svn: fix rename test (delete renamed directories after revert) --- .../idea/svn/rollback/SvnRollbackEnvironment.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java index fc9a6b3ce6e2..265d4ca5b9e5 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java @@ -355,6 +355,10 @@ public class SvnRollbackEnvironment extends DefaultRollbackEnvironment { toFromTo(file); } + private void markRename(@NotNull final File beforeFile, @NotNull final File afterFile) { + myToBeDeleted.add(new Pair(beforeFile, afterFile)); + } + public ThroughRenameInfo findToFile(@NotNull final FilePath file, @Nullable final File firstTo) { final String path = FilePathsHelper.convertPath(file); if (myAlsoReverted.contains(path)) return null; @@ -589,8 +593,10 @@ public class SvnRollbackEnvironment extends DefaultRollbackEnvironment { final ContentRevision afterRevision = change.getAfterRevision(); final String key = afterRevision == null ? null : FilePathsHelper.convertWithLastSeparator(afterRevision.getFile()); if (MoveRenameReplaceCheck.check(change)) { - renames.put(key, beforeRevision.getFile().getIOFile()); + final File beforeFile = beforeRevision.getFile().getIOFile(); + renames.put(key, beforeFile); files.put(key, afterRevision.getFile()); + myCollector.markRename(beforeFile, afterRevision.getFile().getIOFile()); } else if (afterRevision != null) { alsoReverted.add(key); }