File: mergeall-products/unzipped/test/expected-output-3.0/more-tests-Windows/9-UPDATE-withcruft-backwards-reset--mergeall-date161012-time182820.txt
Using Python 3.5+ os.scandir() optimized variant. Starting. ------------------------------------------------------------------------------- *Collecting tree differences 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.000389013591528887 ------------------------------------------------------------------------------- *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** [(['.DS_Store', '._.TemporaryItems', 'd1', 'f1.txt'], 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1'), (['.DS_Store', '.fseventsd', '.Trashes', '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** [(['$RECYCLE.BIN', '.Trash-1000', 'd2', 'Desktop.ini', 'f2.txt'], 'C:/MY-STUFF/Code/mergeall/test/test2', 'C:/MY-STUFF/Code/mergeall/test/test1'), (['desktop.ini', 'f5.txt', 'Thumbs.db'], '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 ....backing up all items to C:/MY-STUFF/Code/mergeall/test/test1\__bkp__\date161012-time182821 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 file, C:/MY-STUFF/Code/mergeall/test/test1\.DS_Store removed old TO file, C:/MY-STUFF/Code/mergeall/test/test1\._.TemporaryItems 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\.DS_Store removed old TO dir, C:/MY-STUFF/Code/mergeall/test/test1\d3\.fseventsd removed old TO file, C:/MY-STUFF/Code/mergeall/test/test1\d3\.Trashes 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\$RECYCLE.BIN copied new FROM dir, C:/MY-STUFF/Code/mergeall/test/test2\.Trash-1000 copied new FROM dir, C:/MY-STUFF/Code/mergeall/test/test2\d2 copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test2\Desktop.ini 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\desktop.ini copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test2\d3\f5.txt copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test2\d3\Thumbs.db 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.026321949798675692 ------------------------------------------------------------------------------- *Summary Compared => files: 6, folders: 2 Differences => samefile: 4, uniqueto: 8, uniquefrom: 8, mixedmode: 2 Changed: files => created: 5, deleted: 6, replaced: 5 folders => created: 3, deleted: 2, replaced: 1 ------------------------------------------------------------------------------- Finished.