From c3ae2a35e66391b3c6570a4e9e62311dc0db59e4 Mon Sep 17 00:00:00 2001 From: "COLA@Redmine.local" Date: Mon, 13 Feb 2017 21:21:48 +0100 Subject: [PATCH] Fixed so revision only is reused if a *new* revision has been created after the lock. #615 --- lib/redmine_dmsf/webdav/dmsf_resource.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb index cea063f1..d4cd4e6f 100644 --- a/lib/redmine_dmsf/webdav/dmsf_resource.rb +++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb @@ -745,7 +745,8 @@ private next if lock.expired? # lock should be exclusive but just in case make sure we find this users lock next if lock.user != User.current - if lock.revision != file.last_revision.id + if lock.revision < file.last_revision.id + # At least one new revision has been created since the lock was created, reuse that revision. return true end end