![[Home page]](../PythonPowered.gif "Home page"){kind=small}
| Books | Code | Blog | Python | Author | Train | Find | ©M.Lutz |
File: android-deltas-sync/_etc/examples/large-appspecific-storage/logs/pc/21-10-18--sync-3-apply-deltas-proxy-log.txt
mergeall 3.2 starting
-------------------------------------------------------------------------------
*Collecting tree differences
Skipping system cruft (metadata) files in both FROM and TO
comparing [/Users/me/DELTAS] [/Volumes/SAMSUNG_T5/MY-STUFF]
excluding /Volumes/SAMSUNG_T5/MY-STUFF/__bkp__
excluding /Users/me/DELTAS/__added__.txt
comparing [/Users/me/DELTAS/Code] [/Volumes/SAMSUNG_T5/MY-STUFF/Code]
comparing [/Users/me/DELTAS/Code/frigcal] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal]
comparing [/Users/me/DELTAS/Code/frigcal/Calendars] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal/Calendars]
comparing [/Users/me/DELTAS/Code/frigcal/Calendars/Backups] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal/Calendars/Backups]
comparing [/Users/me/DELTAS/Code/fold3-vs-deltas] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas]
comparing [/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync]
comparing [/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc]
comparing [/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots]
comparing [/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage]
comparing [/Users/me/DELTAS/Code/fold3-vs-deltas/_private] [/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/_private]
comparing [/Users/me/DELTAS/__more__] [/Volumes/SAMSUNG_T5/MY-STUFF/__more__]
comparing [/Users/me/DELTAS/__more__/Email] [/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email]
comparing [/Users/me/DELTAS/__more__/Email/PostDec2015] [/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email/PostDec2015]
comparing [/Users/me/DELTAS/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent] [/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent]
comparing [/Users/me/DELTAS/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent/Primary-Device] [/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent/Primary-Device]
Phase runtime: 0.008035886999999999
-------------------------------------------------------------------------------
*Reporting tree differences
-------------------------------------------------------------------------------
SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why)
**These items will be replaced in dirto by automatic resolution**
[('frigcal-default-calendar.ics',
'/Users/me/DELTAS/Code/frigcal/Calendars',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal/Calendars',
'modtime'),
('_README.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync',
'modtime'),
('__sloc__.py',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc',
'modtime'),
('index.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots',
'modtime'),
('android11-sync-script-solid.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-sync-script-termux.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-pydroid3-tap-run.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-pydroid3-tap-ide.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-termux-widget-edit.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-sync-script-solid.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-pydroid3-tap-ide.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-sync-script-termux.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-termux-widget-edit.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-termux-widget-run.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-pydroid3-shortcuts.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-xplorer-appspecific.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-pydroid3-tap-run.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-termux-widget-run.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-pydroid3-shortcuts.jpg',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('android11-xplorer-appspecific.jpg.html',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'modtime'),
('_publish.sh',
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc',
'modtime'),
('_publish.sh',
'/Users/me/DELTAS/Code/fold3-vs-deltas',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas',
'modtime'),
('pmg-sentmail.txt',
'/Users/me/DELTAS/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent/Primary-Device',
'/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent/Primary-Device',
'modtime')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto)
**These items will be deleted from dirto by automatic resolution**
[(['Music',
'Sheets',
'Camera',
'Training',
'Books',
'Websites',
'Gadgets',
'.nomedia',
'Writing'],
'/Users/me/DELTAS',
'/Volumes/SAMSUNG_T5/MY-STUFF'),
(['stripgifs',
'tagpix',
'siteforward',
'fixeoln',
...etc...
'android-tkinter',
'apache-downloads',
'genhtml'],
'/Users/me/DELTAS/Code',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code'),
(['__sloc__.py',
'guimaker_pp4e.py',
'frigcal_configs_base.py',
...etc...
'frigcal.py',
'icalendar',
'.htaccess'],
'/Users/me/DELTAS/Code/frigcal',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal'),
(['optr-error-mr1615',
'abqmoving.ics',
...etc...
'Holidays.ics',
'Bills--see-ics-shared'],
'/Users/me/DELTAS/Code/frigcal/Calendars',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal/Calendars'),
(['date150406-time102022--arg1.ics',
'date161210-time145731--2.0-test-makenew.ics',
'date161210-time145933--2.0-frigcal-default-calendar.ics',
...etc...
'date190503-time155826--working--Full-Calendar-From-Outlook-July1112.ics',
'date160827-time120525--trips.ics',
'date160929-time174232--spammo.ics'],
'/Users/me/DELTAS/Code/frigcal/Calendars/Backups',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal/Calendars/Backups'),
(['fold3-vs-deltas.html'],
'/Users/me/DELTAS/Code/fold3-vs-deltas',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas'),
(['z_postcopy_hook_phone.py',
'sync-changes-part2-phone.py',
'config_pc.py',
'initial-copy-part1-pc.py',
'config_phone.py',
'sync-changes-part1-pc.py',
'common.py',
'initial-copy-part2-phone.py'],
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync'),
(['bash-version',
'PythonPowered.gif',
'examples',
'_README.txt',
'sync-changes-shim.py'],
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc'),
(['android11-pydroid3-tap-run.jpg',
'android11-termux-widget-edit.jpg',
'android11-sync-script-solid.jpg',
'android11-pydroid3-tap-ide.jpg',
'android11-sync-script-termux.jpg',
'android11-termux-widget-run.jpg',
'_generate.sh',
'android11-xplorer-appspecific.jpg',
'android11-pydroid3-shortcuts.jpg'],
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots'),
(['deltas-verify-link2',
'uncompressed-zip-test',
'TODO.txt',
...etc...
'fold3-update-shots',
'deltas-fix-times.txt',
'android11-pydroid3-shortcuts.jpg',
'fold3-vs-deltas--prescripts.html'],
'/Users/me/DELTAS/Code/fold3-vs-deltas/_private',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/_private'),
(['Misc',
'Genealogy',
...etc...
'Insurance'],
'/Users/me/DELTAS/__more__',
'/Volumes/SAMSUNG_T5/MY-STUFF/__more__'),
(['UptoDec2015'],
'/Users/me/DELTAS/__more__/Email',
'/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email'),
(['SavedOnUSBSharedFolder',
'Sorted',
'allthemail-mail-lutzmv-start-to-mar2319.txt'],
'/Users/me/DELTAS/__more__/Email/PostDec2015',
'/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email/PostDec2015'),
(['vaio-z', 'macbook', '_README.txt'],
'/Users/me/DELTAS/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent',
'/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent'),
(['sentgmail.txt'],
'/Users/me/DELTAS/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent/Primary-Device',
'/Volumes/SAMSUNG_T5/MY-STUFF/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent/Primary-Device')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto)
**These items will be copied over to dirto by automatic resolution**
[(['date211018-time101024--frigcal-default-calendar.ics'],
'/Users/me/DELTAS/Code/frigcal/Calendars/Backups',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal/Calendars/Backups'),
(['x-android11-access-termux.jpg', 'x-android11-access-pydroid3.jpg'],
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots'),
(['x-android11-access-termux.jpg.html',
'x-android11-access-termux.jpg',
'x-android11-access-pydroid3.jpg',
'x-android11-access-pydroid3.jpg.html'],
'/Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage'),
(['x-android11-access-termux.jpg', 'x-android11-access-pydroid3.jpg'],
'/Users/me/DELTAS/Code/fold3-vs-deltas/_private',
'/Volumes/SAMSUNG_T5/MY-STUFF/Code/fold3-vs-deltas/_private')]
-------------------------------------------------------------------------------
MIXED MODE NAMES: (name, dirfrom, dirto)
**These items will be replaced in dirto by automatic resolution**
[]
-------------------------------------------------------------------------------
*Resolving tree differences
Skipping system cruft (metadata) files in FROM folders
....pruning /Volumes/SAMSUNG_T5/MY-STUFF/__bkp__/date191206-time164614
....backing up all items to /Volumes/SAMSUNG_T5/MY-STUFF/__bkp__/date211018-time122540
....removed added file: /Volumes/SAMSUNG_T5/MY-STUFF/Code/frigcal/Calendars/Backups/date211007-time141253--frigcal-default-calendar.ics
....prior file/dir additions removed: 1/0
replaced same file, using FROM /Users/me/DELTAS/Code/frigcal/Calendars/frigcal-default-calendar.ics
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_README.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/__sloc__.py
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/index.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-sync-script-solid.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-sync-script-termux.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-pydroid3-tap-run.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-pydroid3-tap-ide.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-termux-widget-edit.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-sync-script-solid.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-pydroid3-tap-ide.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-sync-script-termux.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-termux-widget-edit.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-termux-widget-run.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-pydroid3-shortcuts.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-xplorer-appspecific.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-pydroid3-tap-run.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-termux-widget-run.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-pydroid3-shortcuts.jpg
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/android11-xplorer-appspecific.jpg.html
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/_publish.sh
replaced same file, using FROM /Users/me/DELTAS/Code/fold3-vs-deltas/_publish.sh
replaced same file, using FROM /Users/me/DELTAS/__more__/Email/PostDec2015/Saved-email-pymailgui-localsent/Primary-Device/pmg-sentmail.txt
....retaining all common TO items
copied new FROM file, /Users/me/DELTAS/Code/frigcal/Calendars/Backups/date211018-time101024--frigcal-default-calendar.ics
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/x-android11-access-termux.jpg
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/x-android11-access-pydroid3.jpg
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/x-android11-access-termux.jpg.html
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/x-android11-access-termux.jpg
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/x-android11-access-pydroid3.jpg
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/android-deltas-sync/_etc/screenshots/_thumbspage/x-android11-access-pydroid3.jpg.html
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/_private/x-android11-access-termux.jpg
copied new FROM file, /Users/me/DELTAS/Code/fold3-vs-deltas/_private/x-android11-access-pydroid3.jpg
Phase runtime: 1.1155990649999998
-------------------------------------------------------------------------------
*Summary
Compared => files: 23, folders: 16, symlinks: 0
Differences => samefile: 23, uniqueto: n/a, uniquefrom: 9, mixedmode: 0
Changed:
files => created: 9, deleted: 1, replaced: 23
folders => created: 0, deleted: 0, replaced: 0
-------------------------------------------------------------------------------
Finished.