[Zope3-checkins] CVS: Zope3/src/zope/app/fssync - committer.py:1.3

[Guido van Rossum]

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

Modified Files:
	committer.py 
Log Message:
Trap unresolved conflicts.


=== Zope3/src/zope/app/fssync/committer.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/fssync/committer.py:1.2	Wed May 28 11:46:08 2003
+++ Zope3/src/zope/app/fssync/committer.py	Wed May 28 18:31:46 2003
@@ -151,6 +151,8 @@
     def synch_old(self, container, name, fspath):
         """Helper to synchronize an existing object."""
         entry = self.metadata.getentry(fspath)
+        if "conflict" in entry:
+            self.report_conflict(fspath)
         obj = container[name]
         adapter = self.get_adapter(obj)
         if IObjectDirectory.isImplementedBy(adapter):