Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 19029)
+++ trunk/ippTools/share/Makefile.am	(revision 19038)
@@ -59,5 +59,6 @@
 	difftool_inputskyfile.sql \
 	difftool_definebyquery.sql \
-	difftool_revertdiffskyfile.sql \
+	difftool_revertdiffskyfile_update.sql \
+	difftool_revertdiffskyfile_delete.sql \
 	difftool_skyfile.sql \
 	difftool_todiffskyfile.sql \
Index: trunk/ippTools/share/difftool_revertdiffskyfile.sql
===================================================================
--- trunk/ippTools/share/difftool_revertdiffskyfile.sql	(revision 19029)
+++ 	(revision )
@@ -1,3 +1,0 @@
-DELETE FROM diffSkyfile
-WHERE
-    fault != 0
Index: trunk/ippTools/share/difftool_revertdiffskyfile_delete.sql
===================================================================
--- trunk/ippTools/share/difftool_revertdiffskyfile_delete.sql	(revision 19038)
+++ trunk/ippTools/share/difftool_revertdiffskyfile_delete.sql	(revision 19038)
@@ -0,0 +1,3 @@
+DELETE FROM diffSkyfile
+WHERE
+    fault != 0
Index: trunk/ippTools/share/difftool_revertdiffskyfile_update.sql
===================================================================
--- trunk/ippTools/share/difftool_revertdiffskyfile_update.sql	(revision 19038)
+++ trunk/ippTools/share/difftool_revertdiffskyfile_update.sql	(revision 19038)
@@ -0,0 +1,5 @@
+UPDATE diffRun
+JOIN diffSkyfile USING(diff_id)
+SET diffRun.state = 'run'
+WHERE
+    diffSkyfile.fault != 0
Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 19029)
+++ trunk/ippTools/src/difftool.c	(revision 19038)
@@ -598,26 +598,90 @@
     PXOPT_COPY_S16(config->args, where, "-code",     "fault", "==");
 
-    psString query = pxDataGet("difftool_revertdiffskyfile.sql");
-    if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-        return false;
-    }
-
-    if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile");
-        psStringAppend(&query, " AND %s", whereClause);
-        psFree(whereClause);
-    }
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(where);
+        return false;
+    }
+
+    int num;                            // Number affected
+
+    // Update state to 'run'
+    {
+        psString query = pxDataGet("difftool_revertdiffskyfile_update.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+
+        if (psListLength(where->list)) {
+            psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile");
+            psStringAppend(&query, " AND %s", whereClause);
+            psFree(whereClause);
+        }
+
+        if (!p_psDBRunQuery(config->dbh, query)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(query);
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+        psFree(query);
+
+        num = psDBAffectedRows(config->dbh);
+
+        if (num < 1) {
+            psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+    }
+
+    // Delete product
+    {
+        psString query = pxDataGet("difftool_revertdiffskyfile_delete.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+
+        if (psListLength(where->list)) {
+            psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile");
+            psStringAppend(&query, " AND %s", whereClause);
+            psFree(whereClause);
+        }
+
+        if (!p_psDBRunQuery(config->dbh, query)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(query);
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+        psFree(query);
+
+        if (psDBAffectedRows(config->dbh) != num) {
+            psError(PS_ERR_UNKNOWN, false, "Updated and deleted different number of entries!");
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+    }
+
     psFree(where);
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(query);
-        return false;
-    }
-    psFree(query);
-
-    if (psDBAffectedRows(config->dbh) < 1) {
-        psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
     }