[Checkins] SVN: zope.app.fssync/branches/achapman-tests-pass/src/zope/app/fssync/merge.py order updates reliably

[Fred Drake]

Log message for revision 117724:
  order updates reliably
  

Changed:
  U   zope.app.fssync/branches/achapman-tests-pass/src/zope/app/fssync/merge.py

-=-
Modified: zope.app.fssync/branches/achapman-tests-pass/src/zope/app/fssync/merge.py
===================================================================
--- zope.app.fssync/branches/achapman-tests-pass/src/zope/app/fssync/merge.py	2010-10-18 15:17:47 UTC (rev 117723)
+++ zope.app.fssync/branches/achapman-tests-pass/src/zope/app/fssync/merge.py	2010-10-18 15:23:27 UTC (rev 117724)
@@ -122,6 +122,7 @@
     for root, dirs, files in os.walk(source):
         if '@@Zope' in dirs:
             dirs.remove('@@Zope')
+        files.sort()
         for filename in ([''] + files):
             source_path = os.path.join(root, filename)
             if metadata.getentry(source_path):