MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

svn: fix rename test (delete renamed directories after revert)

Browse Source
This commit is contained in:
irengrig
2012-12-12 12:49:46 +04:00
parent 05bf671ea0
commit d95b422159
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java
+7 -1
View File
@@ -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<File, File>(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);
}