[Zope3-checkins] CVS: Zope3/src/zope/fssync - merger.py:1.9

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/fssync
In directory cvs.zope.org:/tmp/cvs-serv21966

Modified Files:
	merger.py 
Log Message:
When the "conflict" flag is set, report it or clear it.  With unit
test.


=== Zope3/src/zope/fssync/merger.py 1.8 => 1.9 ===
--- Zope3/src/zope/fssync/merger.py:1.8	Wed May 14 18:24:42 2003
+++ Zope3/src/zope/fssync/merger.py	Wed May 28 16:23:55 2003
@@ -262,6 +262,10 @@
                 return ("Nothing", "Uptodate")
             else:
                 # Only local changes
+                if "conflict" in lmeta:
+                    if lmeta["conflict"] == os.path.getmtime(local):
+                        return ("Nothing", "Conflict")
+                    del lmeta["conflict"]
                 return ("Nothing", "Modified")
         else:
             # Some local changes; classify local changes