Index: branches/haf_add201112/ippTools/share/Makefile.am
===================================================================
--- branches/haf_add201112/ippTools/share/Makefile.am	(revision 32980)
+++ branches/haf_add201112/ippTools/share/Makefile.am	(revision 33003)
@@ -311,8 +311,12 @@
 	minidvodbtool_revertminidvodbcopy.sql \
 	mergetool_find_minidvodb_id.sql \
+	mergetool_find_mergedvodbcopy.sql \
+	mergetool_find_merge_id_dvo.sql \
 	mergetool_find_pendingmergeprocess.sql \
 	mergetool_find_pending_merge.sql \
 	mergetool_find_processed.sql \
+	mergetool_queue_mergecopy_id.sql \
 	mergetool_queue_merge_id.sql \
+	mergetool_revertmergedvodbcopy.sql \
 	mergetool_revertmergedvodbprocessed.sql \
 	pstamptool_completedreq.sql \
Index: branches/haf_add201112/ippTools/share/addtool_find_minidvodbrun2.sql
===================================================================
--- branches/haf_add201112/ippTools/share/addtool_find_minidvodbrun2.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/addtool_find_minidvodbrun2.sql	(revision 33003)
@@ -1,4 +1,4 @@
 -- this selects the minidvodbs that have complete addRuns
-SELECT minidvodb_name, minidvodb_path, mergedvodb_path, state, minidbg 
+SELECT minidvodb_name, minidvodb_path, state, minidbg 
 AS minidvodb_group 
 FROM minidvodbRun 
Index: branches/haf_add201112/ippTools/share/addtool_queue_minidvodbrun.sql
===================================================================
--- branches/haf_add201112/ippTools/share/addtool_queue_minidvodbrun.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/addtool_queue_minidvodbrun.sql	(revision 33003)
@@ -4,5 +4,4 @@
     minidvodb_name,
     minidvodb_path,
-    mergedvodb_path,
     'new'
 
Index: branches/haf_add201112/ippTools/share/mergetool_find_merge_id_dvo.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_find_merge_id_dvo.sql	(revision 33003)
+++ branches/haf_add201112/ippTools/share/mergetool_find_merge_id_dvo.sql	(revision 33003)
@@ -0,0 +1,9 @@
+SELECT mergedvodbRun.* FROM mergedvodbRun
+JOIN mergedvodbProcessed USING(merge_id)
+WHERE ( mergedvodbRun.state = 'merged' OR mergedvodbRun.state = 'full')
+      AND mergedvodbProcessed.fault = 0
+    AND merge_id NOT IN (SELECT merge_id
+       FROM mergedvodbCopy
+       JOIN mergedvodbRun USING(mergedvodb_id)
+       WHERE %s
+      )
Index: branches/haf_add201112/ippTools/share/mergetool_find_mergedvodbcopy.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_find_mergedvodbcopy.sql	(revision 33003)
+++ branches/haf_add201112/ippTools/share/mergetool_find_mergedvodbcopy.sql	(revision 33003)
@@ -0,0 +1,7 @@
+SELECT
+    mergedvodbCopy.*,
+    mergedvodbRun.mergedvodb_path
+FROM mergedvodbCopy
+    JOIN mergedvodbRun using (mergedvodb_id)
+
+
Index: branches/haf_add201112/ippTools/share/mergetool_find_pending_merge.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_find_pending_merge.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_find_pending_merge.sql	(revision 33003)
@@ -1,5 +1,8 @@
 SELECT
     mergedvodbRun.*
-FROM mergedvodbRun
+    minidvodbRun.minidvodb_path
+FROM minidvodbRun 
+JOIN mergedvodbRun 
+    USING(minidvodb_id)
 LEFT JOIN mergedvodbProcessed
     USING(merge_id)
Index: branches/haf_add201112/ippTools/share/mergetool_queue_mergecopy_id.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_queue_mergecopy_id.sql	(revision 33003)
+++ branches/haf_add201112/ippTools/share/mergetool_queue_mergecopy_id.sql	(revision 33003)
@@ -0,0 +1,16 @@
+INSERT INTO mergedvodbCopy
+    SELECT
+        0,              -- mergedvodbcopy_id
+        merge_id,         -- merge_id
+        '%s',           -- mergedvodb_rsync_path
+        '%s',           -- destination_host
+	%d,           -- fault
+        '%s',           -- state
+        %s,           -- epoch
+        %f           -- dtime
+        
+    FROM mergedvodbRun
+    WHERE
+        (mergedvodbRun.state = 'merged'
+ 	OR mergedvodbRun.state = 'full')
+        AND mergedvodbRun.merge_id = %lld
Index: branches/haf_add201112/ippTools/share/mergetool_revertmergedvodbcopy.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_revertmergedvodbcopy.sql	(revision 33003)
+++ branches/haf_add201112/ippTools/share/mergetool_revertmergedvodbcopy.sql	(revision 33003)
@@ -0,0 +1,7 @@
+UPDATE mergedvodbCopy
+ --   SET minidvodbCopy.state = 'new',
+    SET mergedvodbCopy.fault = 0
+WHERE
+    mergedvodbCopy.state = 'new'
+    AND mergedvodbCopy.fault >0    
+
Index: branches/haf_add201112/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql
===================================================================
--- branches/haf_add201112/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql	(revision 33003)
@@ -1,5 +1,6 @@
 SELECT minidvodbRun.* FROM minidvodbRun
 JOIN minidvodbProcessed USING(minidvodb_id)
-WHERE minidvodbRun.state = 'merged'
+WHERE minidvodbRun.state = 'merged'	
+      AND minidvodbProcessed.fault = 0
     AND minidvodb_id NOT IN (SELECT minidvodb_id
        FROM minidvodbCopy