This test runs mergeall, diffall, and rollbacks from the command line, using the following steps in sequence:
Command lines are highlighted along the way, with user inputs in bold. mergeall commands can also be run with the GUI and console launchers.
c:\Code\mergeall>prompt $P$G$S # add a space after > prompt c:\Code\mergeall> cd test c:\Code\mergeall\test> test-1-2-do-unzip.py # or use a "py -3" prefix to force 3.X About to UNZIP: confirm with 'y'? y Removing test1 Removing test2 Unzipping from test-1-2.zip to . Extracted test1/ => test1 Extracted test1/.DS_Store => test1\.DS_Store Extracted test1/._.TemporaryItems => test1\._.TemporaryItems Extracted test1/f0.txt => test1\f0.txt Extracted test1/f1.txt => test1\f1.txt Extracted test1/f3.txt => test1\f3.txt Extracted test1/f6.txt => test1\f6.txt Extracted test1/m1 => test1\m1 Extracted test1/d1/ => test1\d1 Extracted test1/d1/._.DS_Store => test1\d1\._.DS_Store Extracted test1/d1/._someimage.png => test1\d1\._someimage.png Extracted test1/d1/fa1.txt => test1\d1\fa1.txt Extracted test1/d3/ => test1\d3 Extracted test1/d3/.DS_Store => test1\d3\.DS_Store Extracted test1/d3/.htaccess => test1\d3\.htaccess Extracted test1/d3/.Trashes => test1\d3\.Trashes Extracted test1/d3/f2.txt => test1\d3\f2.txt Extracted test1/d3/f3.txt => test1\d3\f3.txt Extracted test1/d3/f4.txt => test1\d3\f4.txt Extracted test1/d3/.fseventsd/ => test1\d3\.fseventsd Extracted test1/d3/.fseventsd/no_log => test1\d3\.fseventsd\no_log Extracted test1/m2/ => test1\m2 Extracted test1/m2/.DS_Store => test1\m2\.DS_Store Extracted test1/m2/.htaccess => test1\m2\.htaccess Extracted test2/ => test2 Extracted test2/Desktop.ini => test2\Desktop.ini Extracted test2/f0.txt => test2\f0.txt Extracted test2/f2.txt => test2\f2.txt Extracted test2/f3.txt => test2\f3.txt Extracted test2/f6.txt => test2\f6.txt Extracted test2/m2 => test2\m2 Extracted test2/$RECYCLE.BIN/ => test2\$RECYCLE.BIN Extracted test2/.Trash-1000/ => test2\.Trash-1000 Extracted test2/d2/ => test2\d2 Extracted test2/d3/ => test2\d3 Extracted test2/d3/.htaccess => test2\d3\.htaccess Extracted test2/d3/desktop.ini => test2\d3\desktop.ini Extracted test2/d3/f2.txt => test2\d3\f2.txt Extracted test2/d3/f3.txt => test2\d3\f3.txt Extracted test2/d3/f5.txt => test2\d3\f5.txt Extracted test2/d3/Thumbs.db => test2\d3\Thumbs.db Extracted test2/m1/ => test2\m1 Extracted test2/__bkp__/ => test2\__bkp__ Extracted test2/__bkp__/README.txt => test2\__bkp__\README.txt Extracted test2/__bkp__/date150325-time115227/ => test2\__bkp__\date150325-time115227 Extracted test2/__bkp__/date150325-time115227/f2.txt => test2\__bkp__\date150325-time115227\f2.txt Extracted test2/__bkp__/date150325-time115227/f3.txt => test2\__bkp__\date150325-time115227\f3.txt Extracted test2/__bkp__/date150325-time115227/m2 => test2\__bkp__\date150325-time115227\m2 Extracted test2/__bkp__/date150325-time115227/__added__.txt => test2\__bkp__\date150325-time115227\__added__.txt Extracted test2/__bkp__/date150325-time115227/d2/ => test2\__bkp__\date150325-time115227\d2 Extracted test2/__bkp__/date150325-time115227/d3/ => test2\__bkp__\date150325-time115227\d3 Extracted test2/__bkp__/date150325-time115227/d3/f3.txt => test2\__bkp__\date150325-time115227\d3\f3.txt Extracted test2/__bkp__/date150325-time115227/d3/f5.txt => test2\__bkp__\date150325-time115227\d3\f5.txt Extracted test2/__bkp__/date150325-time115227/m1/ => test2\__bkp__\date150325-time115227\m1 Extracted test2/__bkp__/date150325-time115317/ => test2\__bkp__\date150325-time115317 Extracted test2/__bkp__/date150325-time115317/spam.txt => test2\__bkp__\date150325-time115317\spam.txt Extracted test2/__bkp__/date150325-time115355/ => test2\__bkp__\date150325-time115355 Extracted test2/__bkp__/date150325-time115355/__added__.txt => test2\__bkp__\date150325-time115355\__added__.txt Extracted test2/__bkp__/date150325-time115417/ => test2\__bkp__\date150325-time115417 Extracted test2/__bkp__/date150325-time115417/__added__.txt => test2\__bkp__\date150325-time115417\__added__.txt Extracted test2/__bkp__/date150325-time115452/ => test2\__bkp__\date150325-time115452 Extracted test2/__bkp__/date150325-time115452/spam2.txt => test2\__bkp__\date150325-time115452\spam2.txt Extracted test2/__bkp__/date150325-time115452/__added__.txt => test2\__bkp__\date150325-time115452\__added__.txt Extracted test2/__bkp__/date150325-time115541/ => test2\__bkp__\date150325-time115541 Extracted test2/__bkp__/date150325-time115541/f0.txt => test2\__bkp__\date150325-time115541\f0.txt Extracted test2/__bkp__/date150325-time115549/ => test2\__bkp__\date150325-time115549 Extracted test2/__bkp__/date150325-time115549/f0.txt => test2\__bkp__\date150325-time115549\f0.txt Extracted test2/__bkp__/date150325-time115557/ => test2\__bkp__\date150325-time115557 Extracted test2/__bkp__/date150325-time115557/f0.txt => test2\__bkp__\date150325-time115557\f0.txt Extracted test2/__bkp__/date150325-time115607/ => test2\__bkp__\date150325-time115607 Extracted test2/__bkp__/date150325-time115607/f0.txt => test2\__bkp__\date150325-time115607\f0.txt Extracted test2/__bkp__/date150325-time115737/ => test2\__bkp__\date150325-time115737 Extracted test2/__bkp__/date150325-time115737/f0.txt => test2\__bkp__\date150325-time115737\f0.txt Extracted test2/__bkp__/date150325-time115737/__added__.txt => test2\__bkp__\date150325-time115737\__added__.txt Press Enter to exit. c:\Code\mergeall\test> cd ..
c:\Code\mergeall> xcopy /E test\test2 _original_
Overwrite C:\Code\mergeall\_original_\Desktop.ini (Yes/No/All)? A
test\test2\Desktop.ini
test\test2\f0.txt
test\test2\f2.txt
test\test2\f3.txt
test\test2\f6.txt
test\test2\m2
test\test2\d3\.htaccess
test\test2\d3\desktop.ini
test\test2\d3\f2.txt
test\test2\d3\f3.txt
test\test2\d3\f5.txt
test\test2\d3\Thumbs.db
test\test2\__bkp__\README.txt
test\test2\__bkp__\date150325-time115227\f2.txt
test\test2\__bkp__\date150325-time115227\f3.txt
test\test2\__bkp__\date150325-time115227\m2
test\test2\__bkp__\date150325-time115227\__added__.txt
test\test2\__bkp__\date150325-time115227\d3\f3.txt
test\test2\__bkp__\date150325-time115227\d3\f5.txt
test\test2\__bkp__\date150325-time115317\spam.txt
test\test2\__bkp__\date150325-time115355\__added__.txt
test\test2\__bkp__\date150325-time115417\__added__.txt
test\test2\__bkp__\date150325-time115452\spam2.txt
test\test2\__bkp__\date150325-time115452\__added__.txt
test\test2\__bkp__\date150325-time115541\f0.txt
test\test2\__bkp__\date150325-time115549\f0.txt
test\test2\__bkp__\date150325-time115557\f0.txt
test\test2\__bkp__\date150325-time115607\f0.txt
test\test2\__bkp__\date150325-time115737\f0.txt
test\test2\__bkp__\date150325-time115737\__added__.txt
30 File(s) copied
c:\Code\mergeall> mergeall.py test\test1 test\test2 -auto -backup
Starting.
-------------------------------------------------------------------------------
*Collecting tree differences
comparing [test\test1] [test\test2]
excluding test\test2\__bkp__
comparing [test\test1\d3] [test\test2\d3]
Phase runtime: 0.0012594070670476653
-------------------------------------------------------------------------------
*Reporting tree differences
-------------------------------------------------------------------------------
SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why)
**These items will be replaced in dirto by automatic resolution**
[('.htaccess', 'test\\test1\\d3', 'test\\test2\\d3', 'modtime'),
('f3.txt', 'test\\test1\\d3', 'test\\test2\\d3', 'modtime'),
('f3.txt', 'test\\test1', 'test\\test2', 'modtime'),
('f6.txt', 'test\\test1', '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'],
'test\\test1',
'test\\test2'),
(['desktop.ini', 'f5.txt', 'Thumbs.db'], 'test\\test1\\d3', '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'],
'test\\test1',
'test\\test2'),
(['.DS_Store', '.fseventsd', '.Trashes', 'f4.txt'],
'test\\test1\\d3',
'test\\test2\\d3')]
-------------------------------------------------------------------------------
MIXED MODE NAMES: (name, dirfrom, dirto)
**These items will be replaced in dirto by automatic resolution**
[('m1', 'test\\test1', 'test\\test2'), ('m2', 'test\\test1', 'test\\test2')]
-------------------------------------------------------------------------------
*Resolving tree differences
....backing up .htaccess to test\test2\__bkp__\date161011-time072640\d3\.htaccess
replaced same file, using FROM test\test1\d3\.htaccess
....backing up f3.txt to test\test2\__bkp__\date161011-time072640\d3\f3.txt
replaced same file, using FROM test\test1\d3\f3.txt
....backing up f3.txt to test\test2\__bkp__\date161011-time072640\f3.txt
replaced same file, using FROM test\test1\f3.txt
....backing up f6.txt to test\test2\__bkp__\date161011-time072640\f6.txt
replaced same file, using FROM test\test1\f6.txt
....backing up $RECYCLE.BIN to test\test2\__bkp__\date161011-time072640\$RECYCLE.BIN
removed old TO dir, test\test2\$RECYCLE.BIN
....backing up .Trash-1000 to test\test2\__bkp__\date161011-time072640\.Trash-1000
removed old TO dir, test\test2\.Trash-1000
....backing up d2 to test\test2\__bkp__\date161011-time072640\d2
removed old TO dir, test\test2\d2
....backing up Desktop.ini to test\test2\__bkp__\date161011-time072640\Desktop.ini
removed old TO file, test\test2\Desktop.ini
....backing up f2.txt to test\test2\__bkp__\date161011-time072640\f2.txt
removed old TO file, test\test2\f2.txt
....backing up desktop.ini to test\test2\__bkp__\date161011-time072640\d3\desktop.ini
removed old TO file, test\test2\d3\desktop.ini
....backing up f5.txt to test\test2\__bkp__\date161011-time072640\d3\f5.txt
removed old TO file, test\test2\d3\f5.txt
....backing up Thumbs.db to test\test2\__bkp__\date161011-time072640\d3\Thumbs.db
removed old TO file, test\test2\d3\Thumbs.db
copied new FROM file, test\test1\.DS_Store
copied new FROM file, test\test1\._.TemporaryItems
copied new FROM dir, test\test1\d1
copied new FROM file, test\test1\f1.txt
copied new FROM file, test\test1\d3\.DS_Store
copied new FROM dir, test\test1\d3\.fseventsd
copied new FROM file, test\test1\d3\.Trashes
copied new FROM file, test\test1\d3\f4.txt
....backing up m1 to test\test2\__bkp__\date161011-time072640\m1
replaced dir with file, using FROM test\test1\m1
....backing up m2 to test\test2\__bkp__\date161011-time072640\m2
replaced file with dir, using FROM test\test1\m2
Phase runtime: 0.036919149194043016
-------------------------------------------------------------------------------
*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.
c:\Code\mergeall> mergeall.py test\test1 test\test2 -report
Starting.
-------------------------------------------------------------------------------
*Collecting tree differences
comparing [test\test1] [test\test2]
excluding test\test2\__bkp__
comparing [test\test1\d1] [test\test2\d1]
comparing [test\test1\d3] [test\test2\d3]
comparing [test\test1\d3\.fseventsd] [test\test2\d3\.fseventsd]
comparing [test\test1\m2] [test\test2\m2]
Phase runtime: 0.0018233790326561271
-------------------------------------------------------------------------------
*Reporting tree differences
-------------------------------------------------------------------------------
SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why)
**These items will be replaced in dirto by automatic resolution**
[]
-------------------------------------------------------------------------------
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**
[]
-------------------------------------------------------------------------------
*Summary
Compared => files: 19, folders: 5
Differences => samefile: 0, uniqueto: 0, uniquefrom: 0, mixedmode: 0
Changed:
files => created: 0, deleted: 0, replaced: 0
folders => created: 0, deleted: 0, replaced: 0
-------------------------------------------------------------------------------
Finished.
c:\Code\mergeall> diffall.py test\test1 test\test2
--------------------
Comparing test\test1 to test\test2
*UNIQUE items in test\test2:
... __bkp__
Comparing contents
.DS_Store matches
._.TemporaryItems matches
f0.txt matches
f1.txt matches
f3.txt matches
f6.txt matches
m1 matches
--------------------
Comparing test\test1\d1 to test\test2\d1
Directory lists are identical
Comparing contents
._.DS_Store matches
._someimage.png matches
fa1.txt matches
--------------------
Comparing test\test1\d3 to test\test2\d3
Directory lists are identical
Comparing contents
.DS_Store matches
.htaccess matches
.Trashes matches
f2.txt matches
f3.txt matches
f4.txt matches
--------------------
Comparing test\test1\d3\.fseventsd to test\test2\d3\.fseventsd
Directory lists are identical
Comparing contents
no_log matches
--------------------
Comparing test\test1\m2 to test\test2\m2
Directory lists are identical
Comparing contents
.DS_Store matches
.htaccess matches
================================================================================
Runtime hrs:mins:secs = 0:0:0.03
Dirs checked 5, Files checked: 19, Files skipped: 0
Diffs found: 1
- items UNIQUE at [test\test1] - [test\test2]
End of report.
c:\Code\mergeall> rollback.py test\test2
**Warning**
This script builds and runs a command to automatically restore the tree,
whose root path is given on the command line or interactively, to its
state prior to its most recent mergeall synch. It assumes that the tree
has not been changed since this synch, and further assumes that the latest
synch was run with backups enabled. This rollback cannot be undone
automatically.
Are you sure you want to do this (y=yes)? y
Running rollback command:
.... C:\Users\me\AppData\Local\Programs\Python\Python35\python.exe c:\Code\mergeall\mergeall.py test\test2\__bkp__\date161011-time072640 test\test2 -auto -restore
Starting.
-------------------------------------------------------------------------------
*Collecting tree differences
comparing [test\test2\__bkp__\date161011-time072640] [test\test2]
excluding test\test2\__bkp__
comparing [test\test2\__bkp__\date161011-time072640\d3] [test\test2\d3]
Phase runtime: 0.0008288530794384326
-------------------------------------------------------------------------------
*Reporting tree differences
-------------------------------------------------------------------------------
SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why)
**These items will be replaced in dirto by automatic resolution**
[('.htaccess',
'test\\test2\\__bkp__\\date161011-time072640\\d3',
'test\\test2\\d3',
'modtime'),
('f3.txt',
'test\\test2\\__bkp__\\date161011-time072640\\d3',
'test\\test2\\d3',
'modtime'),
('f3.txt',
'test\\test2\\__bkp__\\date161011-time072640',
'test\\test2',
'modtime'),
('f6.txt',
'test\\test2\\__bkp__\\date161011-time072640',
'test\\test2',
'filesize')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto)
**These items will be deleted from dirto by automatic resolution**
[(['.DS_Store', '._.TemporaryItems', 'd1', 'f0.txt', 'f1.txt'],
'test\\test2\\__bkp__\\date161011-time072640',
'test\\test2'),
(['.DS_Store', '.fseventsd', '.Trashes', 'f2.txt', 'f4.txt'],
'test\\test2\\__bkp__\\date161011-time072640\\d3',
'test\\test2\\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',
'__added__.txt'],
'test\\test2\\__bkp__\\date161011-time072640',
'test\\test2'),
(['desktop.ini', 'f5.txt', 'Thumbs.db'],
'test\\test2\\__bkp__\\date161011-time072640\\d3',
'test\\test2\\d3')]
-------------------------------------------------------------------------------
MIXED MODE NAMES: (name, dirfrom, dirto)
**These items will be replaced in dirto by automatic resolution**
[('m1', 'test\\test2\\__bkp__\\date161011-time072640', 'test\\test2'),
('m2', 'test\\test2\\__bkp__\\date161011-time072640', 'test\\test2')]
-------------------------------------------------------------------------------
*Resolving tree differences
....removed added file: test\test2\.DS_Store
....removed added file: test\test2\._.TemporaryItems
....removed added dir: test\test2\d1
....removed added file: test\test2\f1.txt
....removed added file: test\test2\d3\.DS_Store
....removed added dir: test\test2\d3\.fseventsd
....removed added file: test\test2\d3\.Trashes
....removed added file: test\test2\d3\f4.txt
....prior file/dir additions removed: 6/2
replaced same file, using FROM test\test2\__bkp__\date161011-time072640\d3\.htaccess
replaced same file, using FROM test\test2\__bkp__\date161011-time072640\d3\f3.txt
replaced same file, using FROM test\test2\__bkp__\date161011-time072640\f3.txt
replaced same file, using FROM test\test2\__bkp__\date161011-time072640\f6.txt
....retained unique item in TO tree: [test\test2\.DS_Store]
....retained unique item in TO tree: [test\test2\._.TemporaryItems]
....retained unique item in TO tree: [test\test2\d1]
....retained unique item in TO tree: [test\test2\f0.txt]
....retained unique item in TO tree: [test\test2\f1.txt]
....retained unique item in TO tree: [test\test2\d3\.DS_Store]
....retained unique item in TO tree: [test\test2\d3\.fseventsd]
....retained unique item in TO tree: [test\test2\d3\.Trashes]
....retained unique item in TO tree: [test\test2\d3\f2.txt]
....retained unique item in TO tree: [test\test2\d3\f4.txt]
copied new FROM dir, test\test2\__bkp__\date161011-time072640\$RECYCLE.BIN
copied new FROM dir, test\test2\__bkp__\date161011-time072640\.Trash-1000
copied new FROM dir, test\test2\__bkp__\date161011-time072640\d2
copied new FROM file, test\test2\__bkp__\date161011-time072640\Desktop.ini
copied new FROM file, test\test2\__bkp__\date161011-time072640\f2.txt
copied new FROM file, test\test2\__bkp__\date161011-time072640\__added__.txt
copied new FROM file, test\test2\__bkp__\date161011-time072640\d3\desktop.ini
copied new FROM file, test\test2\__bkp__\date161011-time072640\d3\f5.txt
copied new FROM file, test\test2\__bkp__\date161011-time072640\d3\Thumbs.db
replaced file with dir, using FROM test\test2\__bkp__\date161011-time072640\m1
replaced dir with file, using FROM test\test2\__bkp__\date161011-time072640\m2
....removed __added__.txt file from TO tree root
Phase runtime: 0.03637374822903516
-------------------------------------------------------------------------------
*Summary
Compared => files: 4, folders: 2
Differences => samefile: 4, uniqueto: 10, uniquefrom: 9, mixedmode: 2
Changed:
files => created: 5, deleted: 6, replaced: 5
folders => created: 3, deleted: 2, replaced: 1
-------------------------------------------------------------------------------
Finished.
Press Enter to exit.
c:\Code\mergeall> mergeall.py test\test2 _original_ -report Starting. ------------------------------------------------------------------------------- *Collecting tree differences comparing [test\test2] [_original_] excluding test\test2\__bkp__ excluding _original_\__bkp__ comparing [test\test2\$RECYCLE.BIN] [_original_\$RECYCLE.BIN] comparing [test\test2\.Trash-1000] [_original_\.Trash-1000] comparing [test\test2\d2] [_original_\d2] comparing [test\test2\d3] [_original_\d3] comparing [test\test2\m1] [_original_\m1] Phase runtime: 0.002185024833826198 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [] ------------------------------------------------------------------------------- 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** [] ------------------------------------------------------------------------------- *Summary Compared => files: 12, folders: 6 Differences => samefile: 0, uniqueto: 0, uniquefrom: 0, mixedmode: 0 Changed: files => created: 0, deleted: 0, replaced: 0 folders => created: 0, deleted: 0, replaced: 0 ------------------------------------------------------------------------------- Finished. c:\Code\mergeall> diffall.py test\test2 _original_ -------------------- Comparing test\test2 to _original_ Directory lists are identical Comparing contents Desktop.ini matches f0.txt matches f2.txt matches f3.txt matches f6.txt matches m2 matches -------------------- Comparing test\test2\$RECYCLE.BIN to _original_\$RECYCLE.BIN Directory lists are identical Comparing contents -------------------- Comparing test\test2\.Trash-1000 to _original_\.Trash-1000 Directory lists are identical Comparing contents -------------------- Comparing test\test2\d2 to _original_\d2 Directory lists are identical Comparing contents -------------------- Comparing test\test2\d3 to _original_\d3 Directory lists are identical Comparing contents .htaccess matches desktop.ini matches f2.txt matches f3.txt matches f5.txt matches Thumbs.db matches -------------------- Comparing test\test2\m1 to _original_\m1 Directory lists are identical Comparing contents -------------------- Comparing test\test2\__bkp__ to _original_\__bkp__ *UNIQUE items in test\test2\__bkp__: ... date161011-time072640 Comparing contents README.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115227 to _original_\__bkp__\date150325-time115227 Directory lists are identical Comparing contents f2.txt matches f3.txt matches m2 matches __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115227\d2 to _original_\__bkp__\date150325-time115227\d2 Directory lists are identical Comparing contents -------------------- Comparing test\test2\__bkp__\date150325-time115227\d3 to _original_\__bkp__\date150325-time115227\d3 Directory lists are identical Comparing contents f3.txt matches f5.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115227\m1 to _original_\__bkp__\date150325-time115227\m1 Directory lists are identical Comparing contents -------------------- Comparing test\test2\__bkp__\date150325-time115317 to _original_\__bkp__\date150325-time115317 Directory lists are identical Comparing contents spam.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115355 to _original_\__bkp__\date150325-time115355 Directory lists are identical Comparing contents __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115417 to _original_\__bkp__\date150325-time115417 Directory lists are identical Comparing contents __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115452 to _original_\__bkp__\date150325-time115452 Directory lists are identical Comparing contents spam2.txt matches __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115541 to _original_\__bkp__\date150325-time115541 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115549 to _original_\__bkp__\date150325-time115549 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115557 to _original_\__bkp__\date150325-time115557 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115607 to _original_\__bkp__\date150325-time115607 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115737 to _original_\__bkp__\date150325-time115737 Directory lists are identical Comparing contents f0.txt matches __added__.txt matches ================================================================================ Runtime hrs:mins:secs = 0:0:0.11 Dirs checked 20, Files checked: 30, Files skipped: 0 Diffs found: 1 - items UNIQUE at [test\test2\__bkp__] - [_original_\__bkp__] End of report.
c:\Code\mergeall> cd test c:\Code\mergeall\test> test-1-2-do-unzip.py About to UNZIP: confirm with 'y'? y Removing test1 Removing test2 Unzipping from test-1-2.zip to . Extracted test1/ => test1 Extracted test1/.DS_Store => test1\.DS_Store Extracted test1/._.TemporaryItems => test1\._.TemporaryItems Extracted test1/f0.txt => test1\f0.txt Extracted test1/f1.txt => test1\f1.txt Extracted test1/f3.txt => test1\f3.txt Extracted test1/f6.txt => test1\f6.txt Extracted test1/m1 => test1\m1 Extracted test1/d1/ => test1\d1 Extracted test1/d1/._.DS_Store => test1\d1\._.DS_Store Extracted test1/d1/._someimage.png => test1\d1\._someimage.png Extracted test1/d1/fa1.txt => test1\d1\fa1.txt Extracted test1/d3/ => test1\d3 Extracted test1/d3/.DS_Store => test1\d3\.DS_Store Extracted test1/d3/.htaccess => test1\d3\.htaccess Extracted test1/d3/.Trashes => test1\d3\.Trashes Extracted test1/d3/f2.txt => test1\d3\f2.txt Extracted test1/d3/f3.txt => test1\d3\f3.txt Extracted test1/d3/f4.txt => test1\d3\f4.txt Extracted test1/d3/.fseventsd/ => test1\d3\.fseventsd Extracted test1/d3/.fseventsd/no_log => test1\d3\.fseventsd\no_log Extracted test1/m2/ => test1\m2 Extracted test1/m2/.DS_Store => test1\m2\.DS_Store Extracted test1/m2/.htaccess => test1\m2\.htaccess Extracted test2/ => test2 Extracted test2/Desktop.ini => test2\Desktop.ini Extracted test2/f0.txt => test2\f0.txt Extracted test2/f2.txt => test2\f2.txt Extracted test2/f3.txt => test2\f3.txt Extracted test2/f6.txt => test2\f6.txt Extracted test2/m2 => test2\m2 Extracted test2/$RECYCLE.BIN/ => test2\$RECYCLE.BIN Extracted test2/.Trash-1000/ => test2\.Trash-1000 Extracted test2/d2/ => test2\d2 Extracted test2/d3/ => test2\d3 Extracted test2/d3/.htaccess => test2\d3\.htaccess Extracted test2/d3/desktop.ini => test2\d3\desktop.ini Extracted test2/d3/f2.txt => test2\d3\f2.txt Extracted test2/d3/f3.txt => test2\d3\f3.txt Extracted test2/d3/f5.txt => test2\d3\f5.txt Extracted test2/d3/Thumbs.db => test2\d3\Thumbs.db Extracted test2/m1/ => test2\m1 Extracted test2/__bkp__/ => test2\__bkp__ Extracted test2/__bkp__/README.txt => test2\__bkp__\README.txt Extracted test2/__bkp__/date150325-time115227/ => test2\__bkp__\date150325-time115227 Extracted test2/__bkp__/date150325-time115227/f2.txt => test2\__bkp__\date150325-time115227\f2.txt Extracted test2/__bkp__/date150325-time115227/f3.txt => test2\__bkp__\date150325-time115227\f3.txt Extracted test2/__bkp__/date150325-time115227/m2 => test2\__bkp__\date150325-time115227\m2 Extracted test2/__bkp__/date150325-time115227/__added__.txt => test2\__bkp__\date150325-time115227\__added__.txt Extracted test2/__bkp__/date150325-time115227/d2/ => test2\__bkp__\date150325-time115227\d2 Extracted test2/__bkp__/date150325-time115227/d3/ => test2\__bkp__\date150325-time115227\d3 Extracted test2/__bkp__/date150325-time115227/d3/f3.txt => test2\__bkp__\date150325-time115227\d3\f3.txt Extracted test2/__bkp__/date150325-time115227/d3/f5.txt => test2\__bkp__\date150325-time115227\d3\f5.txt Extracted test2/__bkp__/date150325-time115227/m1/ => test2\__bkp__\date150325-time115227\m1 Extracted test2/__bkp__/date150325-time115317/ => test2\__bkp__\date150325-time115317 Extracted test2/__bkp__/date150325-time115317/spam.txt => test2\__bkp__\date150325-time115317\spam.txt Extracted test2/__bkp__/date150325-time115355/ => test2\__bkp__\date150325-time115355 Extracted test2/__bkp__/date150325-time115355/__added__.txt => test2\__bkp__\date150325-time115355\__added__.txt Extracted test2/__bkp__/date150325-time115417/ => test2\__bkp__\date150325-time115417 Extracted test2/__bkp__/date150325-time115417/__added__.txt => test2\__bkp__\date150325-time115417\__added__.txt Extracted test2/__bkp__/date150325-time115452/ => test2\__bkp__\date150325-time115452 Extracted test2/__bkp__/date150325-time115452/spam2.txt => test2\__bkp__\date150325-time115452\spam2.txt Extracted test2/__bkp__/date150325-time115452/__added__.txt => test2\__bkp__\date150325-time115452\__added__.txt Extracted test2/__bkp__/date150325-time115541/ => test2\__bkp__\date150325-time115541 Extracted test2/__bkp__/date150325-time115541/f0.txt => test2\__bkp__\date150325-time115541\f0.txt Extracted test2/__bkp__/date150325-time115549/ => test2\__bkp__\date150325-time115549 Extracted test2/__bkp__/date150325-time115549/f0.txt => test2\__bkp__\date150325-time115549\f0.txt Extracted test2/__bkp__/date150325-time115557/ => test2\__bkp__\date150325-time115557 Extracted test2/__bkp__/date150325-time115557/f0.txt => test2\__bkp__\date150325-time115557\f0.txt Extracted test2/__bkp__/date150325-time115607/ => test2\__bkp__\date150325-time115607 Extracted test2/__bkp__/date150325-time115607/f0.txt => test2\__bkp__\date150325-time115607\f0.txt Extracted test2/__bkp__/date150325-time115737/ => test2\__bkp__\date150325-time115737 Extracted test2/__bkp__/date150325-time115737/f0.txt => test2\__bkp__\date150325-time115737\f0.txt Extracted test2/__bkp__/date150325-time115737/__added__.txt => test2\__bkp__\date150325-time115737\__added__.txt Press Enter to exit. c:\Code\mergeall\test> cd ..
c:\Code\mergeall> mergeall.py test\test1 test\test2 -auto -backup -quiet -skipcruft
Starting.
-------------------------------------------------------------------------------
*Collecting tree differences
Skipping system cruft (metadata) files in both FROM and TO
comparing [test\test1] [test\test2]
excluding test\test2\__bkp__
comparing [test\test1\d3] [test\test2\d3]
Phase runtime: 0.00446779177607674
-------------------------------------------------------------------------------
*Reporting tree differences
-------------------------------------------------------------------------------
SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why)
**These items will be replaced in dirto by automatic resolution**
[('.htaccess', 'test\\test1\\d3', 'test\\test2\\d3', 'modtime'),
('f3.txt', 'test\\test1\\d3', 'test\\test2\\d3', 'modtime'),
('f3.txt', 'test\\test1', 'test\\test2', 'modtime'),
('f6.txt', 'test\\test1', 'test\\test2', 'filesize')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto)
**These items will be deleted from dirto by automatic resolution**
[(['d2', 'f2.txt'], 'test\\test1', 'test\\test2'),
(['f5.txt'], 'test\\test1\\d3', 'test\\test2\\d3')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto)
**These items will be copied over to dirto by automatic resolution**
[(['d1', 'f1.txt'], 'test\\test1', 'test\\test2'),
(['f4.txt'], 'test\\test1\\d3', 'test\\test2\\d3')]
-------------------------------------------------------------------------------
MIXED MODE NAMES: (name, dirfrom, dirto)
**These items will be replaced in dirto by automatic resolution**
[('m1', 'test\\test1', 'test\\test2'), ('m2', 'test\\test1', 'test\\test2')]
-------------------------------------------------------------------------------
*Resolving tree differences
Skipping system cruft (metadata) files in FROM folders
....backing up all items to test\test2\__bkp__\date161011-time072957
replaced same file, using FROM test\test1\d3\.htaccess
replaced same file, using FROM test\test1\d3\f3.txt
replaced same file, using FROM test\test1\f3.txt
replaced same file, using FROM test\test1\f6.txt
removed old TO dir, test\test2\d2
removed old TO file, test\test2\f2.txt
removed old TO file, test\test2\d3\f5.txt
copied new FROM dir, test\test1\d1
copied new FROM file, test\test1\f1.txt
copied new FROM file, test\test1\d3\f4.txt
replaced dir with file, using FROM test\test1\m1
replaced file with dir, using FROM test\test1\m2
Phase runtime: 0.019626615371608164
-------------------------------------------------------------------------------
*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.
c:\Code\mergeall> mergeall.py test\test1 test\test2 -report Starting. ------------------------------------------------------------------------------- *Collecting tree differences comparing [test\test1] [test\test2] excluding test\test2\__bkp__ comparing [test\test1\d1] [test\test2\d1] comparing [test\test1\d3] [test\test2\d3] comparing [test\test1\m2] [test\test2\m2] Phase runtime: 0.0017515385829642346 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto) **These items will be deleted from dirto by automatic resolution** [(['$RECYCLE.BIN', '.Trash-1000', 'Desktop.ini'], 'test\\test1', 'test\\test2'), (['desktop.ini', 'Thumbs.db'], 'test\\test1\\d3', 'test\\test2\\d3')] ------------------------------------------------------------------------------- UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto) **These items will be copied over to dirto by automatic resolution** [(['.DS_Store', '._.TemporaryItems'], 'test\\test1', 'test\\test2'), (['._.DS_Store', '._someimage.png'], 'test\\test1\\d1', 'test\\test2\\d1'), (['.DS_Store', '.fseventsd', '.Trashes'], 'test\\test1\\d3', 'test\\test2\\d3'), (['.DS_Store'], 'test\\test1\\m2', 'test\\test2\\m2')] ------------------------------------------------------------------------------- MIXED MODE NAMES: (name, dirfrom, dirto) **These items will be replaced in dirto by automatic resolution** [] ------------------------------------------------------------------------------- *Summary Compared => files: 11, folders: 4 Differences => samefile: 0, uniqueto: 5, uniquefrom: 8, mixedmode: 0 Changed: files => created: 0, deleted: 0, replaced: 0 folders => created: 0, deleted: 0, replaced: 0 ------------------------------------------------------------------------------- Finished. c:\Code\mergeall> mergeall.py test\test1 test\test2 -report -skipcruft Starting. ------------------------------------------------------------------------------- *Collecting tree differences Skipping system cruft (metadata) files in both FROM and TO comparing [test\test1] [test\test2] excluding test\test2\__bkp__ comparing [test\test1\d1] [test\test2\d1] comparing [test\test1\d3] [test\test2\d3] comparing [test\test1\m2] [test\test2\m2] Phase runtime: 0.0052902916184675896 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [] ------------------------------------------------------------------------------- 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** [] ------------------------------------------------------------------------------- *Summary Compared => files: 11, folders: 4 Differences => samefile: 0, uniqueto: 0, uniquefrom: 0, mixedmode: 0 Changed: files => created: 0, deleted: 0, replaced: 0 folders => created: 0, deleted: 0, replaced: 0 ------------------------------------------------------------------------------- Finished.
c:\Code\mergeall> diffall.py test\test1 test\test2 -------------------- Comparing test\test1 to test\test2 *UNIQUE items in test\test1: ... .DS_Store ... ._.TemporaryItems *UNIQUE items in test\test2: ... $RECYCLE.BIN ... .Trash-1000 ... Desktop.ini ... __bkp__ Comparing contents f0.txt matches f1.txt matches f3.txt matches f6.txt matches m1 matches -------------------- Comparing test\test1\d1 to test\test2\d1 *UNIQUE items in test\test1\d1: ... ._.DS_Store ... ._someimage.png Comparing contents fa1.txt matches -------------------- Comparing test\test1\d3 to test\test2\d3 *UNIQUE items in test\test1\d3: ... .DS_Store ... .fseventsd ... .Trashes *UNIQUE items in test\test2\d3: ... desktop.ini ... Thumbs.db Comparing contents .htaccess matches f2.txt matches f3.txt matches f4.txt matches -------------------- Comparing test\test1\m2 to test\test2\m2 *UNIQUE items in test\test1\m2: ... .DS_Store Comparing contents .htaccess matches ================================================================================ Runtime hrs:mins:secs = 0:0:0.02 Dirs checked 4, Files checked: 11, Files skipped: 0 Diffs found: 4 - items UNIQUE at [test\test1] - [test\test2] - items UNIQUE at [test\test1\d1] - [test\test2\d1] - items UNIQUE at [test\test1\d3] - [test\test2\d3] - items UNIQUE at [test\test1\m2] - [test\test2\m2] End of report. c:\Code\mergeall> diffall.py test\test1 test\test2 -skipcruft -------------------- Comparing test\test1 to test\test2 *UNIQUE items in test\test2: ... __bkp__ Comparing contents f0.txt matches f1.txt matches f3.txt matches f6.txt matches m1 matches -------------------- Comparing test\test1\d1 to test\test2\d1 Directory lists are identical Comparing contents fa1.txt matches -------------------- Comparing test\test1\d3 to test\test2\d3 Directory lists are identical Comparing contents .htaccess matches f2.txt matches f3.txt matches f4.txt matches -------------------- Comparing test\test1\m2 to test\test2\m2 Directory lists are identical Comparing contents .htaccess matches ================================================================================ Runtime hrs:mins:secs = 0:0:0.02 Dirs checked 4, Files checked: 11, Files skipped: 0 System metadata (cruft) files were skipped Diffs found: 1 - items UNIQUE at [test\test1] - [test\test2] End of report.
c:\Code\mergeall> rollback.py test\test2
**Warning**
This script builds and runs a command to automatically restore the tree,
whose root path is given on the command line or interactively, to its
state prior to its most recent mergeall synch. It assumes that the tree
has not been changed since this synch, and further assumes that the latest
synch was run with backups enabled. This rollback cannot be undone
automatically.
Are you sure you want to do this (y=yes)? y
Running rollback command:
.... C:\Users\me\AppData\Local\Programs\Python\Python35\python.exe c:\Code\mergeall\mergeall.py test\test2\__bkp__\date161011-time072957 test\test2 -auto -restore
Starting.
-------------------------------------------------------------------------------
*Collecting tree differences
comparing [test\test2\__bkp__\date161011-time072957] [test\test2]
excluding test\test2\__bkp__
comparing [test\test2\__bkp__\date161011-time072957\d3] [test\test2\d3]
Phase runtime: 0.0010140743749025632
-------------------------------------------------------------------------------
*Reporting tree differences
-------------------------------------------------------------------------------
SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why)
**These items will be replaced in dirto by automatic resolution**
[('.htaccess',
'test\\test2\\__bkp__\\date161011-time072957\\d3',
'test\\test2\\d3',
'modtime'),
('f3.txt',
'test\\test2\\__bkp__\\date161011-time072957\\d3',
'test\\test2\\d3',
'modtime'),
('f3.txt',
'test\\test2\\__bkp__\\date161011-time072957',
'test\\test2',
'modtime'),
('f6.txt',
'test\\test2\\__bkp__\\date161011-time072957',
'test\\test2',
'filesize')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN DIRTO: (names, dirfrom, dirto)
**These items will be deleted from dirto by automatic resolution**
[(['$RECYCLE.BIN', '.Trash-1000', 'd1', 'Desktop.ini', 'f0.txt', 'f1.txt'],
'test\\test2\\__bkp__\\date161011-time072957',
'test\\test2'),
(['desktop.ini', 'f2.txt', 'f4.txt', 'Thumbs.db'],
'test\\test2\\__bkp__\\date161011-time072957\\d3',
'test\\test2\\d3')]
-------------------------------------------------------------------------------
UNIQUE ITEMS IN DIRFROM: (names, dirfrom, dirto)
**These items will be copied over to dirto by automatic resolution**
[(['d2', 'f2.txt', '__added__.txt'],
'test\\test2\\__bkp__\\date161011-time072957',
'test\\test2'),
(['f5.txt'],
'test\\test2\\__bkp__\\date161011-time072957\\d3',
'test\\test2\\d3')]
-------------------------------------------------------------------------------
MIXED MODE NAMES: (name, dirfrom, dirto)
**These items will be replaced in dirto by automatic resolution**
[('m1', 'test\\test2\\__bkp__\\date161011-time072957', 'test\\test2'),
('m2', 'test\\test2\\__bkp__\\date161011-time072957', 'test\\test2')]
-------------------------------------------------------------------------------
*Resolving tree differences
....removed added dir: test\test2\d1
....removed added file: test\test2\f1.txt
....removed added file: test\test2\d3\f4.txt
....prior file/dir additions removed: 2/1
replaced same file, using FROM test\test2\__bkp__\date161011-time072957\d3\.htaccess
replaced same file, using FROM test\test2\__bkp__\date161011-time072957\d3\f3.txt
replaced same file, using FROM test\test2\__bkp__\date161011-time072957\f3.txt
replaced same file, using FROM test\test2\__bkp__\date161011-time072957\f6.txt
....retained unique item in TO tree: [test\test2\$RECYCLE.BIN]
....retained unique item in TO tree: [test\test2\.Trash-1000]
....retained unique item in TO tree: [test\test2\d1]
....retained unique item in TO tree: [test\test2\Desktop.ini]
....retained unique item in TO tree: [test\test2\f0.txt]
....retained unique item in TO tree: [test\test2\f1.txt]
....retained unique item in TO tree: [test\test2\d3\desktop.ini]
....retained unique item in TO tree: [test\test2\d3\f2.txt]
....retained unique item in TO tree: [test\test2\d3\f4.txt]
....retained unique item in TO tree: [test\test2\d3\Thumbs.db]
copied new FROM dir, test\test2\__bkp__\date161011-time072957\d2
copied new FROM file, test\test2\__bkp__\date161011-time072957\f2.txt
copied new FROM file, test\test2\__bkp__\date161011-time072957\__added__.txt
copied new FROM file, test\test2\__bkp__\date161011-time072957\d3\f5.txt
replaced file with dir, using FROM test\test2\__bkp__\date161011-time072957\m1
replaced dir with file, using FROM test\test2\__bkp__\date161011-time072957\m2
....removed __added__.txt file from TO tree root
Phase runtime: 0.029867544781768757
-------------------------------------------------------------------------------
*Summary
Compared => files: 4, folders: 2
Differences => samefile: 4, uniqueto: 10, uniquefrom: 4, mixedmode: 2
Changed:
files => created: 2, deleted: 2, replaced: 5
folders => created: 1, deleted: 1, replaced: 1
-------------------------------------------------------------------------------
Finished.
Press Enter to exit.
c:\Code\mergeall> mergeall.py test\test2 _original_ -report Starting. ------------------------------------------------------------------------------- *Collecting tree differences comparing [test\test2] [_original_] excluding test\test2\__bkp__ excluding _original_\__bkp__ comparing [test\test2\$RECYCLE.BIN] [_original_\$RECYCLE.BIN] comparing [test\test2\.Trash-1000] [_original_\.Trash-1000] comparing [test\test2\d2] [_original_\d2] comparing [test\test2\d3] [_original_\d3] comparing [test\test2\m1] [_original_\m1] Phase runtime: 0.0018326645329564397 ------------------------------------------------------------------------------- *Reporting tree differences ------------------------------------------------------------------------------- SAMEFILE DIFFERENCES: (name, dirfrom, dirto, why) **These items will be replaced in dirto by automatic resolution** [] ------------------------------------------------------------------------------- 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** [] ------------------------------------------------------------------------------- *Summary Compared => files: 12, folders: 6 Differences => samefile: 0, uniqueto: 0, uniquefrom: 0, mixedmode: 0 Changed: files => created: 0, deleted: 0, replaced: 0 folders => created: 0, deleted: 0, replaced: 0 ------------------------------------------------------------------------------- Finished. c:\Code\mergeall> diffall.py test\test2 _original_ -------------------- Comparing test\test2 to _original_ Directory lists are identical Comparing contents Desktop.ini matches f0.txt matches f2.txt matches f3.txt matches f6.txt matches m2 matches -------------------- Comparing test\test2\$RECYCLE.BIN to _original_\$RECYCLE.BIN Directory lists are identical Comparing contents -------------------- Comparing test\test2\.Trash-1000 to _original_\.Trash-1000 Directory lists are identical Comparing contents -------------------- Comparing test\test2\d2 to _original_\d2 Directory lists are identical Comparing contents -------------------- Comparing test\test2\d3 to _original_\d3 Directory lists are identical Comparing contents .htaccess matches desktop.ini matches f2.txt matches f3.txt matches f5.txt matches Thumbs.db matches -------------------- Comparing test\test2\m1 to _original_\m1 Directory lists are identical Comparing contents -------------------- Comparing test\test2\__bkp__ to _original_\__bkp__ *UNIQUE items in test\test2\__bkp__: ... date161011-time072957 Comparing contents README.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115227 to _original_\__bkp__\date150325-time115227 Directory lists are identical Comparing contents f2.txt matches f3.txt matches m2 matches __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115227\d2 to _original_\__bkp__\date150325-time115227\d2 Directory lists are identical Comparing contents -------------------- Comparing test\test2\__bkp__\date150325-time115227\d3 to _original_\__bkp__\date150325-time115227\d3 Directory lists are identical Comparing contents f3.txt matches f5.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115227\m1 to _original_\__bkp__\date150325-time115227\m1 Directory lists are identical Comparing contents -------------------- Comparing test\test2\__bkp__\date150325-time115317 to _original_\__bkp__\date150325-time115317 Directory lists are identical Comparing contents spam.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115355 to _original_\__bkp__\date150325-time115355 Directory lists are identical Comparing contents __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115417 to _original_\__bkp__\date150325-time115417 Directory lists are identical Comparing contents __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115452 to _original_\__bkp__\date150325-time115452 Directory lists are identical Comparing contents spam2.txt matches __added__.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115541 to _original_\__bkp__\date150325-time115541 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115549 to _original_\__bkp__\date150325-time115549 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115557 to _original_\__bkp__\date150325-time115557 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115607 to _original_\__bkp__\date150325-time115607 Directory lists are identical Comparing contents f0.txt matches -------------------- Comparing test\test2\__bkp__\date150325-time115737 to _original_\__bkp__\date150325-time115737 Directory lists are identical Comparing contents f0.txt matches __added__.txt matches ================================================================================ Runtime hrs:mins:secs = 0:0:0.11 Dirs checked 20, Files checked: 30, Files skipped: 0 Diffs found: 1 - items UNIQUE at [test\test2\__bkp__] - [_original_\__bkp__] End of report. c:\Code\mergeall>