Fixed so revision only is reused if a *new* revision has been created after the lock. #615

2017-02-13 21:21:48 +01:00 · 2017-02-13 21:21:48 +01:00 · c3ae2a35e6
commit c3ae2a35e6
parent b90e2983e8
1 changed files with 2 additions and 1 deletions
--- 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