www

commit 9b4eb42c2995c1563869b121d2a831034b294d03
parent 0750f49bb03354cfb35fa54f839a861f93d256d0
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu,  4 Feb 2010 14:39:40 +0000

Auto-reset in case of unhandled delete conflict


Diffstat:
M
chrome/content/zotero/xpcom/sync.js
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
@@ -2581,8 +2581,9 @@ Zotero.Sync.Server.Data = new function() {
 								break;
 							
 							default:
-								alert('Delete reconciliation unimplemented for ' + types);
-								throw ('Delete reconciliation unimplemented for ' + types);
+								var msg = 'Cannot reconcile delete conflict for ' + type;
+								var e = new Zotero.Error(msg, "FULL_SYNC_REQUIRED");
+								throw (e);
 						}
 					}
 				}