File: mergeall-products/unzipped/test/expected-output-3.0/more-tests-Windows/12-UPDATE-skipcruft-backwards-reset--mergeall-date161012-time183135.txt
Using Python 3.5+ os.scandir() optimized variant. Starting. ------------------------------------------------------------------------------- *Collecting tree differences Skipping system cruft (metadata) files in both FROM and TO comparing [C:/MY-STUFF/Code/mergeall/test/test2] [C:/MY-STUFF/Code/mergeall/test/test1] excluding C:/MY-STUFF/Code/mergeall/test/test2\__bkp__ comparing [C:/MY-STUFF/Code/mergeall/test/test2\d3] [C:/MY-STUFF/Code/mergeall/test/test1\d3] Phase runtime: 0.003956111838475301 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [('.htaccess', 'C:/MY-STUFF/Code/mergeall/test/test2\\d3', 'C:/MY-STUFF/Code/mergeall/test/test1\\d3', 'modtime'), ('f3.txt', 'C:/MY-STUFF/Code/mergeall/test/test2\\d3', 'C:/MY-STUFF/Code/mergeall/test/test1\\d3', 'modtime'), ('f3.txt', 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1', 'modtime'), ('f6.txt', 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1', 'filesize')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto) **These items will be deleted from dirto by automatic resolution** [(['d1', 'f1.txt'], 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1'), (['f4.txt'], 'C:/MY-STUFF/Code/mergeall/test/test2\\d3', 'C:/MY-STUFF/Code/mergeall/test/test1\\d3')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto) **These items will be copied over to dirto by automatic resolution** [(['d2', 'f2.txt'], 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1'), (['f5.txt'], 'C:/MY-STUFF/Code/mergeall/test/test2\\d3', 'C:/MY-STUFF/Code/mergeall/test/test1\\d3')] ------------------------------------------------------------------------------- MIXED MODE NAMES: (name, dirfrom, dirto) **These items will be replaced in dirto by automatic resolution** [('m1', 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1'), ('m2', 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1')] ------------------------------------------------------------------------------- *Resolving tree differences Skipping system cruft (metadata) files in FROM folders ....backing up all items to C:/MY-STUFF/Code/mergeall/test/test1\__bkp__\date161012-time183139 replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test2\d3\.htaccess replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test2\d3\f3.txt replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test2\f3.txt replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test2\f6.txt removed old TO dir, C:/MY-STUFF/Code/mergeall/test/test1\d1 removed old TO file, C:/MY-STUFF/Code/mergeall/test/test1\f1.txt removed old TO file, C:/MY-STUFF/Code/mergeall/test/test1\d3\f4.txt copied new FROM dir, C:/MY-STUFF/Code/mergeall/test/test2\d2 copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test2\f2.txt copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test2\d3\f5.txt replaced file with dir, using FROM C:/MY-STUFF/Code/mergeall/test/test2\m1 replaced dir with file, using FROM C:/MY-STUFF/Code/mergeall/test/test2\m2 Phase runtime: 0.015389006260870754 ------------------------------------------------------------------------------- *Summary Compared => files: 6, folders: 2 Differences => samefile: 4, uniqueto: 3, uniquefrom: 3, mixedmode: 2 Changed: files => created: 2, deleted: 2, replaced: 5 folders => created: 1, deleted: 1, replaced: 1 ------------------------------------------------------------------------------- Finished.