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

[sharm svn gnome org]

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

Modified:
   branches/tomboy-sync/ChangeLog
   branches/tomboy-sync/Tomboy/SyncDialog.cs
   branches/tomboy-sync/Tomboy/SyncManager.cs
Log:
* Tomboy/SyncDialog.cs, Tomboy/SyncManager.cs: Apparently better
  conflict handling.  No need to delete if sync can overwrite, no
  need to rename old note if it's being deleted anyway, etc.  Need to
  clean up still, decide whether or not to support updating
  referencing notes on that sort of rename.