File: mergeall-products/unzipped/test/expected-output-3.0/more-tests-MacOSX/12-UPDATE-skipcruft-backwards-reset--mergeall-date161015-time161441.txt
Starting. ------------------------------------------------------------------------------- *Collecting tree differences Skipping system cruft (metadata) files in both FROM and TO comparing [/Users/blue/Desktop/mergeall-3.0-beta/test/test2] [/Users/blue/Desktop/mergeall-3.0-beta/test/test1] excluding /Users/blue/Desktop/mergeall-3.0-beta/test/test2/__bkp__ comparing [/Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3] [/Users/blue/Desktop/mergeall-3.0-beta/test/test1/d3] Phase runtime: 0.0028173230020911433 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [('.htaccess', '/Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1/d3', 'modtime'), ('f3.txt', '/Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1/d3', 'modtime'), ('f3.txt', '/Users/blue/Desktop/mergeall-3.0-beta/test/test2', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1', 'modtime'), ('f6.txt', '/Users/blue/Desktop/mergeall-3.0-beta/test/test2', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1', 'filesize')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto) **These items will be deleted from dirto by automatic resolution** [(['d1', 'f1.txt'], '/Users/blue/Desktop/mergeall-3.0-beta/test/test2', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1'), (['f4.txt'], '/Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1/d3')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto) **These items will be copied over to dirto by automatic resolution** [(['d2', 'f2.txt'], '/Users/blue/Desktop/mergeall-3.0-beta/test/test2', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1'), (['f5.txt'], '/Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1/d3')] ------------------------------------------------------------------------------- MIXED MODE NAMES: (name, dirfrom, dirto) **These items will be replaced in dirto by automatic resolution** [('m1', '/Users/blue/Desktop/mergeall-3.0-beta/test/test2', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1'), ('m2', '/Users/blue/Desktop/mergeall-3.0-beta/test/test2', '/Users/blue/Desktop/mergeall-3.0-beta/test/test1')] ------------------------------------------------------------------------------- *Resolving tree differences Skipping system cruft (metadata) files in FROM folders ....backing up all items to /Users/blue/Desktop/mergeall-3.0-beta/test/test1/__bkp__/date161015-time161442 replaced same file, using FROM /Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3/.htaccess replaced same file, using FROM /Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3/f3.txt replaced same file, using FROM /Users/blue/Desktop/mergeall-3.0-beta/test/test2/f3.txt replaced same file, using FROM /Users/blue/Desktop/mergeall-3.0-beta/test/test2/f6.txt removed old TO dir, /Users/blue/Desktop/mergeall-3.0-beta/test/test1/d1 removed old TO file, /Users/blue/Desktop/mergeall-3.0-beta/test/test1/f1.txt removed old TO file, /Users/blue/Desktop/mergeall-3.0-beta/test/test1/d3/f4.txt copied new FROM dir, /Users/blue/Desktop/mergeall-3.0-beta/test/test2/d2 copied new FROM file, /Users/blue/Desktop/mergeall-3.0-beta/test/test2/f2.txt copied new FROM file, /Users/blue/Desktop/mergeall-3.0-beta/test/test2/d3/f5.txt replaced file with dir, using FROM /Users/blue/Desktop/mergeall-3.0-beta/test/test2/m1 replaced dir with file, using FROM /Users/blue/Desktop/mergeall-3.0-beta/test/test2/m2 Phase runtime: 0.005464755005959887 ------------------------------------------------------------------------------- *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.