From 4b41f4050f01906b07769df1cfd55b27e8976d08 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 3 Sep 2015 15:45:08 +0200
Subject: [PATCH] Show differing etags in error msg

---
 vdirsyncer/sync.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vdirsyncer/sync.py b/vdirsyncer/sync.py
index ae9edac..b45adc6 100644
--- a/vdirsyncer/sync.py
+++ b/vdirsyncer/sync.py
@@ -112,8 +112,12 @@ class StorageSyncer(object):
             props = prefetch[href]
 
             assert props['href'] == href
-            if props.setdefault('etag', etag) != etag:
-                raise SyncError('Etag changed during sync.')
+            old_etag = props.setdefault('etag', etag)
+            if old_etag != etag:
+                raise SyncError(
+                    'Etag changed during sync: Expected {!r}, got {!r}'
+                    .format(old_etag, etag)
+                )
             props['item'] = item
             props['ident'] = ident = item.ident