Dummy merge of default branch into lwtools hg -y merge --tool=internal:fail default hg revert --all --no-backup --rev . hg resolve -a -m This dummy merge discards any changes from the default branch so that the result is the same as what lwtools already had. When merging back to default branch later, the discarded changes will be discarded there also, so the result will be that the default branch will contain what the lwtools branch had before these merges. Only scripts/burst was "rescued" from default branch.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/burst	Sat Jan 11 18:40:44 2014 +0100
@@ -0,0 +1,7 @@
+#!/bin/tcsh
+cd /home/project-web/nitros9/htdocs
+rm -rf latest
+mkdir latest
+cd latest
+unzip -o ../nitros9project.zip
+echo "Options +Indexes">.htaccess