From 1e16282a3e0fb9d5d6154267fbcc0d8d35ae9527 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Thu, 17 Sep 2015 17:17:14 +0300 Subject: [PATCH] IDEA-139795 Do not explicitly set "last modified time" for files during move/rename - as incorrect value could be set resulting in "file cache conflict" issues --- .../src/org/jetbrains/idea/svn/SvnFileSystemListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java index 4ae5446085e1..b0297aec2cb0 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java @@ -281,7 +281,6 @@ public class SvnFileSystemListener extends CommandAdapter implements LocalFileOp } private boolean doMove(@NotNull SvnVcs vcs, final File src, final File dst) { - long srcTime = src.lastModified(); try { final boolean isUndo = isUndo(vcs); final String list = isUndo ? null : SvnChangelistListener.getCurrentMapping(vcs, src); @@ -301,7 +300,6 @@ public class SvnFileSystemListener extends CommandAdapter implements LocalFileOp if (! isUndo && list != null) { SvnChangelistListener.putUnderList(vcs.getProject(), list, dst); } - dst.setLastModified(srcTime); } catch(VcsException e) { addToMoveExceptions(vcs.getProject(), e);