From 988799d13b00bd3dc03216d87bedd4239e8e1229 Mon Sep 17 00:00:00 2001 From: "COLA@Redminetest" Date: Mon, 7 Nov 2016 00:06:46 +0100 Subject: [PATCH] MOVEing a file from .tmp also destroys the .tmp file. (MsOffice rename) --- lib/redmine_dmsf/webdav/dmsf_resource.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb index 0d40f5ca..daceee2b 100644 --- a/lib/redmine_dmsf/webdav/dmsf_resource.rb +++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb @@ -297,8 +297,8 @@ module RedmineDmsf # Save new_revision.save && resource.file.save - # Delete the file that should have been renamed. - file.delete(false) ? NoContent : Conflict + # Delete (and destroy) the file that should have been renamed and return what should have been returned in case of a copy + file.delete(true) ? Created : PreconditionFailed else # Files cannot be merged at this point, until a decision is made on how to merge them # ideally, we would merge revision history for both, ensuring the origin file wins with latest revision.