[CalendarServer-changes] [4389] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4389
          http://trac.macosforge.org/projects/calendarserver/changeset/4389
Author:   cdaboo at apple.com
Date:     2009-06-26 13:53:54 -0700 (Fri, 26 Jun 2009)
Log Message:
-----------
Do proper merging of data wrt RSVP.

Modified Paths:
--------------
    CalendarServer/trunk/run
    CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2009-06-26 20:51:54 UTC (rev 4388)
+++ CalendarServer/trunk/run	2009-06-26 20:53:54 UTC (rev 4389)
@@ -727,7 +727,7 @@
 
 caldavtester="${top}/CalDAVTester";
 
-svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 4386;
+svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 4388;
 
 #
 # PyFlakes

Modified: CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py	2009-06-26 20:51:54 UTC (rev 4388)
+++ CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py	2009-06-26 20:53:54 UTC (rev 4389)
@@ -216,6 +216,7 @@
             old_attendee = old_attendees.get(value)
             if old_attendee:
                 self._transferParameter(old_attendee, new_attendee, "PARTSTAT")
+                self._transferParameter(old_attendee, new_attendee, "RSVP")
                 self._transferParameter(old_attendee, new_attendee, "SCHEDULE-STATUS")
     
     def _transferParameter(self, old_property, new_property, parameter):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090626/45ca9d4a/attachment.html>