File: mergeall-products/unzipped/test/test-normalization-3.3/Normalization/LOGS/6-deltas-apply-33.txt
mergeall 3.3 starting ------------------------------------------------------------------------------- *Collecting tree differences Skipping system cruft (metadata) files in both FROM and TO comparing [DELTAS] [TO] excluding DELTAS/__added__.txt comparing [DELTAS/dir-Liñux] [TO/dir-Liñux] Phase runtime: 0.0020768999999999996 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [('file1-Liñux.txt', 'DELTAS', 'TO', 'modtime'), ('okay.txt', 'DELTAS', 'TO', 'modtime'), ('nested1-Liñux.txt', 'DELTAS/dir-Liñux', 'TO/dir-Liñux', 'modtime'), ('okay-link1', 'DELTAS', 'TO', 'modtime'), ('link-Liñux', 'DELTAS', 'TO', 'modtime')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto) **These items will be deleted from dirto by automatic resolution** [] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto) **These items will be copied over to dirto by automatic resolution** [(['file3-Liñux.txt'], 'DELTAS', 'TO'), (['nested3-Liñux.txt'], 'DELTAS/dir-Liñux', 'TO/dir-Liñux')] ------------------------------------------------------------------------------- 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 ....backing up all items to TO/__bkp__/date211221-time123319 ....removed listed dir: TO/okay-dir ....removed listed file: TO/file2-Liñux.txt propagating symlink TO/okay-link2 ....removed listed file: TO/okay-link2 ....removed listed file: TO/dir-Liñux/nested2-Liñux.txt ....removed 3/1 files/dirs listed in __added__.txt replaced same file, using FROM DELTAS/file1-Liñux.txt replaced same file, using FROM DELTAS/okay.txt replaced same file, using FROM DELTAS/dir-Liñux/nested1-Liñux.txt propagating symlink TO/okay-link1 propagating symlink DELTAS/okay-link1 replaced same file, using FROM DELTAS/okay-link1 propagating symlink TO/link-Liñux propagating symlink DELTAS/link-Liñux replaced same file, using FROM DELTAS/link-Liñux ....retaining all common TO items copied new FROM file, DELTAS/file3-Liñux.txt copied new FROM file, DELTAS/dir-Liñux/nested3-Liñux.txt Phase runtime: 0.005567023000000004 ------------------------------------------------------------------------------- *Summary Compared => files: 3, folders: 2, symlinks: 2 Differences => samefile: 5, uniqueto: 4, uniquefrom: 2, mixedmode: 0 Changed: files => created: 2, deleted: 3, replaced: 5 folders => created: 0, deleted: 1, replaced: 0 ------------------------------------------------------------------------------- Finished.