[Zope3-checkins] CVS: Zope3/src/zope/fssync - fsmerger.py:1.18
Fred L. Drake, Jr.
fred at zope.com
Thu Sep 4 11:29:30 EDT 2003
Update of /cvs-repository/Zope3/src/zope/fssync
In directory cvs.zope.org:/tmp/cvs-serv1073
Modified Files:
fsmerger.py
Log Message:
fix comment
=== Zope3/src/zope/fssync/fsmerger.py 1.17 => 1.18 ===
--- Zope3/src/zope/fssync/fsmerger.py:1.17 Fri Aug 29 11:27:07 2003
+++ Zope3/src/zope/fssync/fsmerger.py Thu Sep 4 10:29:29 2003
@@ -95,7 +95,7 @@
def merge_files(self, local, remote):
"""Merge remote file into local file."""
- # Reset sticky conflict if file was edited or removed
+ # Reset sticky conflict if file was removed
entry = self.metadata.getentry(local)
conflict = entry.get("conflict")
if conflict and not os.path.exists(local):
More information about the Zope3-Checkins
mailing list