[CalendarServer-changes] [8703] CalendarServer/branches/users/glyph/migrate-merge

[source_changes at macosforge.org]

Revision: 8703
          http://trac.macosforge.org/projects/calendarserver/changeset/8703
Author:   glyph at apple.com
Date:     2012-02-16 04:29:11 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
oops, actually do a merge migrate in the test

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/migrate-merge/

Modified: CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py	2012-02-16 12:29:08 UTC (rev 8702)
+++ CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py	2012-02-16 12:29:11 UTC (rev 8703)
@@ -583,7 +583,7 @@
         self.assertIdentical((yield emptyHome.calendarWithName("calendar")),
                              None)
         nonEmpty = yield txn.calendarHomeWithUID("non_empty_home")
-        yield migrateHome(emptyHome, nonEmpty)
+        yield migrateHome(emptyHome, nonEmpty, merge=True)
         yield self.commit()
         txn = self.transactionUnderTest()
         emptyHome = yield txn.calendarHomeWithUID("empty_home")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/a96ac6dc/attachment-0001.html>