From 068471fc0e797428c48b8917d62fe7db0331cc65 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Mon, 15 Dec 2014 23:39:46 -0500
Subject: [PATCH] Don't raise APIAlreadyDeletedError when deleting with
 if-unused related: openstreetmap/iD#2475

---
 lib/diff_reader.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index de2da3c6bf..ca38d35014 100644
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -241,7 +241,7 @@ def commit
           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