|
3-4EAF-B36D-926D3A670229@osafoundation.org> |
|
| ja...@wordzoo.com |
3-4EAF-B36D-926D3A670229@osafoundation.org> |
Thu, 24 Apr, 14:24 |
| m.@osafoundation.org> |
·Ä·in |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
·Ä·in |
Mon, 03 May, 09:42 |
| ja...@wordzoo.com |
.[commits] (morgen) [6479] Switched copy clouds to *not* have blocks copy their collections, plus found a schema problem |
Thu, 24 Apr, 14:24 |
|
im[commits] (bear) [12602] Setting version information for Checkpoint 20061211 |
|
| ja...@wordzoo.com |
im[commits] (bear) [12602] Setting version information for Checkpoint 20061211 |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
im[commits] (bear) [12602] Setting version information for Checkpoint 20061211 |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
im[commits] (bear) [12602] Setting version information for Checkpoint 20061211 |
Thu, 24 Apr, 14:24 |
| ja...@wordzoo.com |
im[commits] (bear) [12602] Setting version information for Checkpoint 20061211 |
Thu, 24 Apr, 14:24 |
|
[No Subject] |
|
| ve |
[No Subject] |
Sat, 14 Jun, 16:51 |
| ung |
[No Subject] |
Tue, 20 Jan, 04:07 |
| ung |
[No Subject] |
Tue, 20 Jan, 04:07 |
| ung |
[No Subject] |
Tue, 20 Jan, 04:07 |
| ung |
[No Subject] |
Tue, 20 Jan, 04:07 |
| ung |
[No Subject] |
Tue, 20 Jan, 04:07 |
| ung |
[No Subject] |
Tue, 20 Jan, 04:07 |
| ung |
[No Subject] |
Tue, 20 Jan, 04:07 |
|
[No Subject] |
Tue, 20 Dec, 12:56 |
|
6D3A670229@osafoundation.org> |
|
| Parlante |
6D3A670229@osafoundation.org> |
Sat, 09 Apr, 03:30 |
| Parlante |
bear) [12602] Setting version information for Checkpoint 20061211 |
Sat, 09 Apr, 03:30 |
|
afoundation.org |
|
| ro...@alldunn.com> |
afoundation.org |
Tue, 17 Jul, 13:32 |
| d...@kei.com> |
afoundation.org |
Thu, 03 Oct, 23:00 |
| r..@osafoundation.org> |
afoundation.org |
Thu, 30 Jan, 06:45 |
| r..@osafoundation.org> |
afoundation.org |
Thu, 30 Jan, 06:45 |
| ic |
duit |
Sun, 07 Jun, 03:49 |
| b.@osafoundation.org |
(morgen) [6479] Switched copy clouds to *not* have blocks copy their collections, plus found a schema problem |
Thu, 25 Apr, 03:33 |
|
s] (bear) [12602] Setting version information for Checkpoint 20061211 |
|
| b.@osafoundation.org |
s] (bear) [12602] Setting version information for Checkpoint 20061211 |
Thu, 25 Apr, 03:33 |
| b.@osafoundation.org |
s] (bear) [12602] Setting version information for Checkpoint 20061211 |
Thu, 25 Apr, 03:33 |
| b.@osafoundation.org |
in wing projects |
Thu, 25 Apr, 03:33 |
|
ear) [12602] Setting version information for Checkpoint 20061211 |
|
| g...@workspot.com |
ear) [12602] Setting version information for Checkpoint 20061211 |
Tue, 23 Feb, 05:18 |
| g...@workspot.com |
ear) [12602] Setting version information for Checkpoint 20061211 |
Tue, 23 Feb, 05:18 |
| g...@workspot.com |
ear) [12602] Setting version information for Checkpoint 20061211 |
Tue, 23 Feb, 05:18 |
|
and convert readline.vcproj. |
|
| g...@workspot.com |
and convert readline.vcproj. |
Tue, 23 Feb, 05:18 |
|
Thu, 14 Dec, 15:30 |
|
| d...@kei.com> |
Thu, 14 Dec, 15:30 |
Thu, 03 Oct, 23:00 |
| d...@kei.com> |
Thu, 14 Dec, 15:30 |
Thu, 03 Oct, 23:00 |
| dawson-li...@mounthermon.org> |
Thu, 14 Dec, 15:30 |
Fri, 24 Mar, 05:11 |
|
Ø·àÀØ·à£Ø· ¼Ø·°Ø· ¥Ø· |
|
| r..@osafoundation.org> |
Ø·àÀØ·à£Ø· ¼Ø·°Ø· ¥Ø· |
Thu, 30 Jan, 06:45 |
| r..@osafoundation.org> |
Ø·àÀØ·à£Ø· ¼Ø·°Ø· ¥Ø· |
Thu, 30 Jan, 06:45 |
| y |
bound diffs
+ inbound = self._get()
+
+ # Merge
+ toSend, toApply, lost = self.merge(rsNewBase, inbound)
+
+ # Apply
+ for itemUUID, rs in toApply.items():
+ self.translator.processRecords(rs)
+
+
+ # Send
+ self._put(toSend)
+
+
+ def merge(self, rsNewBase, inboundDiff):
+
+ # The new sync algorithm
+
+ toSend = {}
+ toApply = {}
+ lost = {}
+
+ for itemUUID, rs in inboundDiff.items():
+ # Until Cosmo supports diffs, we need to compute the diffs
+ # ourselves:
+ rsOld = self.getRecordSet(itemUUID)
+ dInbound = rs - rsOld
+
+ if itemUUID in rsNewBase:
+ dLocal = rsNewBase[itemUUID] - rsOld
+ lost[itemUUID] = dLocal.conflicts(dInbound)
+ rsNewBase[itemUUID] += dInbound
+ toApply[itemUUID] = sync_filter(dInbound) # @@@MOR Hook up
+ rsOld += dInbound
+ self.saveRecordSet(itemUUID, rsOld)
+
+ for itemUUID, rs in rsNewBase.items():
+ rsOld = self.getRecordSet(itemUUID)
+ dOutbound = sync_filter(rs - rsOld) # @@@MOR Hook up
+
+ # If/when Cosmo supports diffs, use the following line:
+ # toSend[i-4973-AB53-01A1A3EE8027@comcast.net> <0E4858C5-5BBB-479A-9C65-5690FCB92BE1@osafoundation.org> <190E431C-5D42-42D3-95D7-AA2F6A9B83A4@comcast.net> |
Wed, 06 May, 16:56 |
| ung |
c6a0@mail.gmail.com> |
Tue, 20 Jan, 04:07 |
| ung |
tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200610.mbox/author" title="Browse October 2006 archives">Oct 2006</a></td><td class="msgcount">187</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200609.mbox/author" title="Browse September 2006 archives">Sep 2006</a></td><td class="msgcount">182</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200608.mbox/author" title="Browse August 2006 archives">Aug 2006</a></td><td class="msgcount">39</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200607.mbox/author" title="Browse July 2006 archives">Jul 2006</a></td><td class="msgcount">11</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200606.mbox/author" title="Browse June 2006 archives">Jun 2006</a></td><td class="msgcount">68</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200605.mbox/author" title="Browse May 2006 archives">May 2006</a></td><td class="msgcount">97</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200604.mbox/author" title="Browse April 2006 archives">Apr 2006</a></td><td class="msgcount">92</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200603.mbox/author" title="Browse March 2006 archives">Mar 2006</a></td><td c507@wordzoo.com> |
Tue, 20 Jan, 04:07 |
|
mits] (bear) [12602] Setting version information for Checkpoint 20061211 |
|
| ot...@peaceful.com |
mits] (bear) [12602] Setting version information for Checkpoint 20061211 |
Sat, 22 Jan, 11:04 |
| ot...@peaceful.com |
mits] (bear) [12602] Setting version information for Checkpoint 20061211 |
Sat, 22 Jan, 11:04 |
| ot...@peaceful.com |
mits] (bear) [12602] Setting version information for Checkpoint 20061211 |
Sat, 22 Jan, 11:04 |
|
y |
|
| m.@osafoundation.org> |
y |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
y |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
iled out described as any time |
Mon, 03 May, 09:42 |
| y |
:29 GMT |
Wed, 06 May, 16:56 |
|
Jared h„4†4@†4˜†4Åðy·% |
|
| y |
Jared h„4†4@†4˜†4Åðy·% |
Wed, 06 May, 16:56 |
| d...@kei.com> |
0E4858C5-5BBB-479A-9C65-5690FCB92BE1@osafoundation.org> <190E431C-5D42-42D3-95D7-AA2F6A9B83A4@comcast.net> |
Thu, 03 Oct, 23:00 |
|
|
|
| ia |
|
Mon, 26 May, 09:29 |
| ia |
ation.org> <190E431C-5D42-42D3-95D7-AA2F6A9B83A4@comcast.net> |
Mon, 26 May, 09:29 |
| ia |
Merge in trunkÁ«áJB
2 K }
C
Á › ÛARÍá§1„Jx |
Mon, 26 May, 09:29 |
|
ommits@osafoundation.org |
|
| ia |
ommits@osafoundation.org |
Mon, 26 May, 09:29 |
| ia |
ommits@osafoundation.org |
Mon, 26 May, 09:29 |
| w.@osafoundation.org> |
8rdSe[commits] (john) [6661Mon, 13 Oct 2008 23:57:18 GMT |
Sat, 24 May, 21:02 |
| w.@osafoundation.org> |
rs] Cosmo and connectivity |
Sat, 24 May, 21:02 |
| isse |
3:11:1commits@osafoundation.org |
Sun, 13 Nov, 20:15 |
|
|
|
| <andre_mueningh...@fastmail.fm> |
|
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
|
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
|
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
|
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
ceholders for various classes; checking things in to coordinate with pje |
Wed, 28 May, 18:41 |
|
Ä·in |
|
| <andre_mueningh...@fastmail.fm> |
Ä·in |
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
Ä·in |
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
its] (sheila) [515] First draft of dashboard spec.</a> </td>
<td class="date">Mon, 11 Apr, 05:03</td>
</tr>
</tbody>
<tfoot>
<tr><th class="title"><a href="browser">Message list</a></th><th class="pages">1 · <a href="/archives/commits-cosmo/200703.mbox/author?1">2</a> · <a href="/archives/commits-cosmo/200703.mbox/author?1">Next »</a></th><th class="sort"><a href="/archives/commits-cosmo/200703.mbox/thread">Thread</a> · Author · <a href="/archives/commits-cosmo/200703.mbox/date">Date</a></th></tr>
</tfoot>
</table>
<table id="boxlist">
<thead><tr><th colspan="2">Box list</th></tr></thead>
<tbody>
<tr> <td class="box"><a href="/archives/commits-cosmo/200809.mbox/author" title="Browse September 2008 archives">Sep 2008</a></td><td class="msgcount">45</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200808.mbox/author" title="Browse August 2008 archives">Aug 2008</a></td><td class="msgcount">18</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200807.mbox/author" title="Browse July 2008 archives">Jul 2008</a></td><td class="msgcount">88</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200806.mbox/author" title="Browse June 2008 archives">Jun 2008</a></td><td class="msgcount">151</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200805.mbox/author" title="Browse May 2008 archives">May 2008</a></td><td class="msgcount">126</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200804.mbox/author" title="Browse April 2008 archives">Apr 2008</a></td><td class="msgcount">152</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200803.mbox/author" title="Browse March 2008 archives">Mar 2008</a></td><td class="msgcount">104</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200802.mbox/author" title="Browse February 2008 archives">Feb 2008</a></td><td class="msgcount">141</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200801.mbox/author" title="Browse January 2008 archives">Jan 2008</a></td><td class="msgcount">59</td>
</tr>
<tr> <td class="box"><a href="/archives/commits-cosmo/200712.mbox/author" title="Browse Decemb6CCCD-7FAA-4CD6-A38A-E3C68384DC5D@osafoundation.org> |
Wed, 28 May, 18:41 |
|
led out described as any time |
|
| <andre_mueningh...@fastmail.fm> |
led out described as any time |
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
led out described as any time |
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
led out described as any time |
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
led out described as any time |
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
led out described as any time |
Wed, 28 May, 18:41 |
| <andre_mueningh...@fastmail.fm> |
led out described as any time |
Wed, 28 May, 18:41 |
| is |
ation for Checkpoint 20061211 |
Sun, 22 Jun, 20:09 |
| is |
board: |
Sun, 22 Jun, 20:09 |
| <harts...@osafoundation.org> |
GMT |
Sun, 12 Apr, 21:12 |
| <harts...@osafoundation.org> |
ck ups |
Sun, 12 Apr, 21:12 |
|
23d01b6ef@mail.gmail.com> <5872ECCE-331A-4615-B0AC-157D2A9EEBA1@osafoundation.org> <1173480696.21100.1178689265@webmail.messagingengine.com> <3C736A87-7283-4EAF-B36D-926D3A670229@osafoundation.org> |
|
| ung |
23d01b6ef@mail.gmail.com> <5872ECCE-331A-4615-B0AC-157D2A9EEBA1@osafoundation.org> <1173480696.21100.1178689265@webmail.messagingengine.com> <3C736A87-7283-4EAF-B36D-926D3A670229@osafoundation.org> |
Tue, 20 Jan, 04:07 |
|
dation.org> |
|
| ung |
dation.org> |
Tue, 20 Jan, 04:07 |
| ung |
dation.org> |
Tue, 20 Jan, 04:07 |
|
Ä·Ä·in |
|
| nen |
Ä·Ä·in |
Wed, 11 Jan, 14:11 |
| e.@amlor.demon.co.uk> |
lternative |
Sun, 06 Jul, 02:55 |