[CalendarServer-changes] [8711] CalendarServer/branches/users/glyph/migrate-merge
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 16 04:29:35 PST 2012
Revision: 8711
http://trac.macosforge.org/projects/calendarserver/changeset/8711
Author: glyph at apple.com
Date: 2012-02-16 04:29:35 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
make existing arg optional so existing tests keep working
Modified Paths:
--------------
CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py
Property Changed:
----------------
CalendarServer/branches/users/glyph/migrate-merge/
Modified: CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py 2012-02-16 12:29:32 UTC (rev 8710)
+++ CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/util.py 2012-02-16 12:29:35 UTC (rev 8711)
@@ -131,7 +131,7 @@
@inlineCallbacks
-def _migrateCalendar(inCalendar, outCalendar, getComponent, merge):
+def _migrateCalendar(inCalendar, outCalendar, getComponent, merge=False):
"""
Copy all calendar objects and properties in the given input calendar to the
given output calendar.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/da10e7a0/attachment-0001.html>
More information about the calendarserver-changes
mailing list