X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6ebb7045fe53d831502f054cf5007843e023d094..86b4d1bc2c05a68053c7485217144a7fcf8ef4e8:/app/controllers/relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index caacd4fb9..dabf6eaa8 100644
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -49,9 +49,14 @@ class RelationController < ApplicationController
     begin
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
+      if new_relation.version != relation.version
+        render :text => "Version mismatch: Provided " + new_relation.version.to_s + ", server had: " + relation.version.to_s, :status => :bad_request
+        return
+      end  
 
       if new_relation and new_relation.id == relation.id
 	relation.update_from new_relation, user
+        render :text => relation.version.to_s, :content_type => "text/plain"
       else
         render :nothing => true, :status => :bad_request
       end
@@ -59,6 +64,9 @@ class RelationController < ApplicationController
       render :nothing => true, :status => :not_found
     rescue OSM::APIPreconditionFailedError
       render :text => "", :status => :precondition_failed
+    rescue OSM::APIVersionMismatchError => ex
+      render :text => "Version mismatch: Provided " + ex.provided.to_s +
+	", server had: " + ex.latest.to_s, :status => :bad_request
     rescue
       render :nothing => true, :status => :internal_server_error
     end