Index: trunk/dbconfig/changes.txt
===================================================================
--- trunk/dbconfig/changes.txt	(revision 20973)
+++ trunk/dbconfig/changes.txt	(revision 20994)
@@ -742,15 +742,4 @@
 ALTER TABLE diffInputSkyfile CHANGE COLUMN skycell_id skycell_id VARCHAR(64) AFTER diff_id;
 
--- WARNING WARNING
--- If you have existing diff runs they must be converted
-
--- run the script collapse_diffinputs.pl here.
---        collapse_diffinputs.pl dbname dbuser dbpass dbhost
-
-DELETE FROM diffInputSkyfile where template = 1;
-
-ALTER TABLE diffInputSkyfile DROP PRIMARY KEY;
-ALTER TABLE diffInputSkyfile ADD PRIMARY KEY (diff_id, skycell_id);
-ALTER TABLE diffInputSkyfile DROP COLUMN template;
 
 ALTER TABLE diffInputSkyfile CHANGE COLUMN warp_id warp1 BIGINT;
@@ -758,7 +747,20 @@
 ALTER TABLE diffInputSkyfile ADD COLUMN warp2 BIGINT AFTER stack1, ADD KEY(warp2);
 ALTER TABLE diffInputSkyfile CHANGE COLUMN stack_id stack2 BIGINT AFTER warp2;
+
+-- WARNING WARNING
+-- If you have existing diff runs they must be converted
+
+-- run the script collapse_diffinputs.pl here.
+
+--        collapse_diffinputs.pl dbname dbuser dbpass dbhost
+
+DELETE FROM diffInputSkyfile where template = 1;
+
+ALTER TABLE diffInputSkyfile DROP PRIMARY KEY;
+ALTER TABLE diffInputSkyfile ADD PRIMARY KEY (diff_id, skycell_id);
+ALTER TABLE diffInputSkyfile DROP COLUMN template;
+
 ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id);
 
-# need to check these
 ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (warp1, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id);
 ALTER TABLE diffInputSkyfile ADD FOREIGN KEY (warp2, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id);