From: Bryan Housel <bryan@7thposition.com>
Date: Tue, 16 Dec 2014 04:39:46 +0000 (-0500)
Subject: Don't raise APIAlreadyDeletedError when deleting with if-unused
X-Git-Tag: live~4860
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/068471fc0e797428c48b8917d62fe7db0331cc65?ds=inline

Don't raise APIAlreadyDeletedError when deleting with if-unused
related: openstreetmap/iD#2475
---

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index de2da3c6b..ca38d3501 100644
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -241,7 +241,7 @@ class DiffReader
           if action_attributes["if-unused"]
             begin
               old.delete_with_history!(new, @changeset.user)
-            rescue OSM::APIPreconditionFailedError => ex
+            rescue OSM::APIAlreadyDeletedError, OSM::APIPreconditionFailedError => ex
               xml_result["new_id"] = old.id.to_s
               xml_result["new_version"] = old.version.to_s
             end