File: mergeall-products/unzipped/test/expected-output-3.0/more-tests-Windows/6-UPDATE-withcruft-reset--mergeall-date161012-time182158.txt
Using Python 3.5+ os.scandir() optimized variant. Starting. ------------------------------------------------------------------------------- *Collecting tree differences comparing [C:/MY-STUFF/Code/mergeall/test/test1] [C:/MY-STUFF/Code/mergeall/test/test2] excluding C:/MY-STUFF/Code/mergeall/test/test2\__bkp__ comparing [C:/MY-STUFF/Code/mergeall/test/test1\d3] [C:/MY-STUFF/Code/mergeall/test/test2\d3] Phase runtime: 0.0004447265933307627 ------------------------------------------------------------------------------- *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/test1\\d3', 'C:/MY-STUFF/Code/mergeall/test/test2\\d3', 'modtime'), ('f3.txt', 'C:/MY-STUFF/Code/mergeall/test/test1\\d3', 'C:/MY-STUFF/Code/mergeall/test/test2\\d3', 'modtime'), ('f3.txt', 'C:/MY-STUFF/Code/mergeall/test/test1', 'C:/MY-STUFF/Code/mergeall/test/test2', 'modtime'), ('f6.txt', 'C:/MY-STUFF/Code/mergeall/test/test1', 'C:/MY-STUFF/Code/mergeall/test/test2', 'filesize')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto) **These items will be deleted from dirto by automatic resolution** [(['$RECYCLE.BIN', '.Trash-1000', 'd2', 'Desktop.ini', 'f2.txt'], 'C:/MY-STUFF/Code/mergeall/test/test1', 'C:/MY-STUFF/Code/mergeall/test/test2'), (['desktop.ini', 'f5.txt', 'Thumbs.db'], 'C:/MY-STUFF/Code/mergeall/test/test1\\d3', 'C:/MY-STUFF/Code/mergeall/test/test2\\d3')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto) **These items will be copied over to dirto by automatic resolution** [(['.DS_Store', '._.TemporaryItems', 'd1', 'f1.txt'], 'C:/MY-STUFF/Code/mergeall/test/test1', 'C:/MY-STUFF/Code/mergeall/test/test2'), (['.DS_Store', '.fseventsd', '.Trashes', 'f4.txt'], 'C:/MY-STUFF/Code/mergeall/test/test1\\d3', 'C:/MY-STUFF/Code/mergeall/test/test2\\d3')] ------------------------------------------------------------------------------- MIXED MODE NAMES: (name, dirfrom, dirto) **These items will be replaced in dirto by automatic resolution** [('m1', 'C:/MY-STUFF/Code/mergeall/test/test1', 'C:/MY-STUFF/Code/mergeall/test/test2'), ('m2', 'C:/MY-STUFF/Code/mergeall/test/test1', 'C:/MY-STUFF/Code/mergeall/test/test2')] ------------------------------------------------------------------------------- *Resolving tree differences ....backing up all items to C:/MY-STUFF/Code/mergeall/test/test2\__bkp__\date161012-time182159 replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test1\d3\.htaccess replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test1\d3\f3.txt replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test1\f3.txt replaced same file, using FROM C:/MY-STUFF/Code/mergeall/test/test1\f6.txt removed old TO dir, C:/MY-STUFF/Code/mergeall/test/test2\$RECYCLE.BIN removed old TO dir, C:/MY-STUFF/Code/mergeall/test/test2\.Trash-1000 removed old TO dir, C:/MY-STUFF/Code/mergeall/test/test2\d2 removed old TO file, C:/MY-STUFF/Code/mergeall/test/test2\Desktop.ini removed old TO file, C:/MY-STUFF/Code/mergeall/test/test2\f2.txt removed old TO file, C:/MY-STUFF/Code/mergeall/test/test2\d3\desktop.ini removed old TO file, C:/MY-STUFF/Code/mergeall/test/test2\d3\f5.txt removed old TO file, C:/MY-STUFF/Code/mergeall/test/test2\d3\Thumbs.db copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test1\.DS_Store copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test1\._.TemporaryItems copied new FROM dir, C:/MY-STUFF/Code/mergeall/test/test1\d1 copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test1\f1.txt copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test1\d3\.DS_Store copied new FROM dir, C:/MY-STUFF/Code/mergeall/test/test1\d3\.fseventsd copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test1\d3\.Trashes copied new FROM file, C:/MY-STUFF/Code/mergeall/test/test1\d3\f4.txt replaced dir with file, using FROM C:/MY-STUFF/Code/mergeall/test/test1\m1 replaced file with dir, using FROM C:/MY-STUFF/Code/mergeall/test/test1\m2 Phase runtime: 0.024587027374143595 ------------------------------------------------------------------------------- *Summary Compared => files: 6, folders: 2 Differences => samefile: 4, uniqueto: 8, uniquefrom: 8, mixedmode: 2 Changed: files => created: 6, deleted: 5, replaced: 5 folders => created: 2, deleted: 3, replaced: 1 ------------------------------------------------------------------------------- Finished.