On Feb 8, 2007, at 12:00 PM, Mimi Yin wrote:
Morgen, is this taking into consideration what we plan to do with
conflict resolution? Or is this how it works today?
I'm talking about how it will work when we add conflict resolution.
My understanding was that if the Chandler user syncs their changes
and then pulls down conflicting changes from the server, the local
edits won't get wiped away.
A "conflict" is defined as a remote change I download when I have
local changes that I haven't yet sent (and the changes are
overlapping, and not the same value). In the case we're talking
about, the Chandler user has *already* sent their changes; the
Chandler user has no outstanding local changes that haven't been sent
to the server. Now if the Cosmo UI user overwrites the title without
seeing the change the Chandler user uploaded, and Chandler then
syncs, to Chandler there is no conflict because the Chandler user has
no local changes. There is nothing to be in conflict with. The
Cosmo UI change is applied locally to Chandler.
Mimi
On Feb 8, 2007, at 10:09 AM, Morgen Sagen wrote:
On Feb 8, 2007, at 9:58 AM, Mimi Yin wrote:
3. However, Chandler users wouldn't have their local changes
automatically overwritten by Cosmo Casual Collaborators. Instead,
Cosmo changes would get stored as Pending Changes and the
Chandler user would decide whether or not to apply them.
This is not the case. If the Chandler user changes the title of
an event and syncs, and then the Cosmo UI user happens to also
change the title of that same event, the next time Chandler syncs
it will get the whatever title the Cosmo user set. The Cosmo-side
change will not be considered a pending conflict by Chandler
because Chandler had already sent its local changes during the
first sync.
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
Open Source Applications Foundation "Design" mailing list
http://lists.osafoundation.org/mailman/listinfo/design
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
Open Source Applications Foundation "Design" mailing list
http://lists.osafoundation.org/mailman/listinfo/design
