tomboy r1339 - in branches/tomboy-sync: . Tomboy

[sharm svn gnome org]

Author: sharm
Date: 2007-07-23 05:58:10 +0100 (Mon, 23 Jul 2007)
New Revision: 1339
ViewCVS link: http://svn.gnome.org/viewcvs/tomboy?rev=1339&view=rev

Modified:
   branches/tomboy-sync/ChangeLog
   branches/tomboy-sync/Tomboy/AddinManager.cs
   branches/tomboy-sync/Tomboy/FileSystemSyncServer.cs
   branches/tomboy-sync/Tomboy/SyncDialog.cs
   branches/tomboy-sync/Tomboy/SyncManager.cs
Log:
* Tomboy/SyncDialog.cs: Testing some half-baked conflict handling
  ideas.  Will probably end up just having different process for
  handling title conflicts (independently created notes) vs content
  conflicts (modifications to note with same GUID).
* Tomboy/SyncManager.cs: Cleanup, comments.  Beginning refactoring of
  SynchronizationThread.  Some half-baked conflict handling code. 
  More accurate note revision handling.  Only calling UploadNotes if
  there are notes to upload.
* Tomboy/FileSystemSyncServer.cs, Tomboy/AddinManager.cs: Comment
  cleanup.