File: mergeall-products/unzipped/test/test-path-normalization-3.3/test-path-normalization-walks/android-shared/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] --Unicode normalized for name: Liñux1 in: DELTAS --Unicode normalized for name: Liñux1 in: TO excluding DELTAS/__added__.txt comparing [DELTAS/Liñux1] [TO/Liñux1] comparing [DELTAS/Liñux1/aaa] [TO/Liñux1/aaa] --Unicode normalized for name: Liñux2 in: DELTAS/Liñux1/aaa --Unicode normalized for name: Liñux2 in: TO/Liñux1/aaa comparing [DELTAS/Liñux1/aaa/Liñux2] [TO/Liñux1/aaa/Liñux2] comparing [DELTAS/Liñux1/aaa/Liñux2/bbb] [TO/Liñux1/aaa/Liñux2/bbb] comparing [DELTAS/Liñux1/aaa/Liñux2/bbb/Liñux3] [TO/Liñux1/aaa/Liñux2/bbb/Liñux3] comparing [DELTAS/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc] [TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc] comparing [DELTAS/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4] [TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4] comparing [DELTAS/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd] [TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd] --Unicode normalized for name: Liñux in: TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd Phase runtime: 0.021145208011148497 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [('plain.txt', 'DELTAS/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd', 'TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd', '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** [] ------------------------------------------------------------------------------- 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 --Unicode morphed for name: TO in: TO --Unicode morphed for name: Liñux1 in: TO/Liñux1 --Unicode morphed for name: aaa in: TO/Liñux1/aaa --Unicode morphed for name: Liñux2 in: TO/Liñux1/aaa/Liñux2 --Unicode morphed for name: bbb in: TO/Liñux1/aaa/Liñux2/bbb --Unicode morphed for name: Liñux3 in: TO/Liñux1/aaa/Liñux2/bbb/Liñux3 --Unicode morphed for name: ccc in: TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc --Unicode morphed for name: Liñux4 in: TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4 --Unicode morphed for name: ddd in: TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd --Unicode morphed for name: Liñux in: TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd/Liñux ....backing up Liñux to TO/__bkp__/date221012-time071925/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd/Liñux ....removed listed file: TO/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd/Liñux ....removed 1/0 files/dirs listed in __added__.txt ....backing up plain.txt to TO/__bkp__/date221012-time071925/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd/plain.txt replaced same file, using FROM DELTAS/Liñux1/aaa/Liñux2/bbb/Liñux3/ccc/Liñux4/ddd/plain.txt ....retaining all common TO items Phase runtime: 0.06890708301216364 ------------------------------------------------------------------------------- *Summary Compared => files: 1, folders: 9, symlinks: 0 Differences => samefile: 1, uniqueto: n/a, uniquefrom: 0, mixedmode: 0 Changed: files => created: 0, deleted: 1, replaced: 1 folders => created: 0, deleted: 0, replaced: 0 ------------------------------------------------------------------------------- Finished.