File: PC-Phone USB Sync/1.5-gui-and-logfiles/1.5 logfiles/date260314-time120420--UNDO.txt

mergeall 3.3 starting
------------------------------------------------------------------------------- 
*Collecting folder differences
Skipping one-platform cruft items in both FROM and TO
comparing [/Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116] to [/Users/me/Desktop/temp/folder2]
excluding /Users/me/Desktop/temp/folder2/__bkp__
excluding /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116/__added__.txt
Phase runtime: 0.0015751670580357313
------------------------------------------------------------------------------- 
*Reporting folder differences
-------------------------------------------------------------------------------
SAME-FILE DIFFERENCES: ([names], from, to, why)
**These items will be replaced in TO when using SYNC**

[(['text1.py', 'text0.py'],
  '/Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116',
  '/Users/me/Desktop/temp/folder2',
  'modtime')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN TO: ([names], from, to)
**These items will be deleted from TO when using SYNC**

[]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN FROM: ([names], from, to)
**These items will be copied to TO when using SYNC**

[(['text4.py', 'folder1'],
  '/Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116',
  '/Users/me/Desktop/temp/folder2')]
-------------------------------------------------------------------------------
MIXED-MODE NAMES: ([names], from, to)
**These items will be replaced in TO when using SYNC**

[(['text3.py', 'text2.py'],
  '/Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116',
  '/Users/me/Desktop/temp/folder2')]
------------------------------------------------------------------------------- 
*Resolving folder differences
Skipping one-platform cruft items in FROM folders
....pruning /Users/me/Desktop/temp/folder2/__bkp__/date260225-time075331--UNDONE
....backing up all items to /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120420
----
....removing listed folder: /Users/me/Desktop/temp/folder2/subfolder1-mix
....removing listed folder: /Users/me/Desktop/temp/folder2/subfolder1
....removing listed file:   /Users/me/Desktop/temp/folder2/text1-b.py
....removing listed folder: /Users/me/Desktop/temp/folder2/subfolder1-b
....removed 1/3 files/folders listed in __added__.txt
----
replacing same file with FROM: /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116/text1.py
replacing same file with FROM: /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116/text0.py
----
....retaining all common TO items
----
copying unique FROM file:   /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116/text4.py
copying unique FROM folder: /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116/folder1
----
replacing folder with file using FROM: /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116/text3.py
replacing file with folder using FROM: /Users/me/Desktop/temp/folder2/__bkp__/date260314-time120116/text2.py
Phase runtime: 0.0046210839645937085
------------------------------------------------------------------------------- 
*Summary
Compared    => files: 2, folders: 1, symlinks: 0
Differences => samefile: 2, uniqueto: n/a, uniquefrom: 2, mixedmode: 2
Changed:
files   => created: 1, deleted: 1, replaced: 3
folders => created: 1, deleted: 3, replaced: 1
-------------------------------------------------------------------------------
Finished.