Merge branch 'master' of ssh://pwebster@git.eclipse.org/gitroot/e4/org.eclipse.migration.git
diff --git a/scripts/migration_script.sh b/scripts/migration_script.sh
index 3c8feb2..122c1be 100644
--- a/scripts/migration_script.sh
+++ b/scripts/migration_script.sh
@@ -245,6 +245,9 @@
cd $ROOT
scp -r deploy.$MODULE_NAME pwebster@git.eclipse.org:/gitroot/e4/${MODULE_NAME}.git
+#
+# DONE, org.eclipse.e4.tools
+#
@@ -425,3 +428,141 @@
# the next step for this one is to be merged into eclipse.platform.runtime ... still to be converted
+
+
+
+
+##################################################
+# next, org.eclipse.e4.ui - leftover e4 bundles and simpleide
+MODULE_NAME=org.eclipse.e4.ui
+
+cd $ROOT
+CVS_LOC=$ROOT/cvsroot.$MODULE_NAME
+mkdir -p $CVS_LOC/e4
+cd $CVS_LOC
+cvs -d :local:$(pwd) init
+
+MIGR_PASS=$MIGR/$MODULE_NAME/pass3
+$MIGR/scripts/copy_e4.sh $MIGR_PASS/modules_e4_ui.sh $CVS_LOC
+
+
+
+# clean the CVS repo of links
+find $CVS_LOC -type l|xargs -n 1 rm
+
+# generate the import data
+# make sure the author names are correct
+# make sure your options file points to the correct tmp cvsroot
+cd $ROOT
+vi $MIGR_PASS/cvs2git.options
+rm -rf cvs2svn-tmp symbol-info.txt cvs2git_log.txt
+cvs2svn-trunk/cvs2git --options=$MIGR_PASS/cvs2git.options >cvs2git_log.txt 2>&1
+cp symbol-info.txt cvs2git_log.txt $MIGR_PASS
+
+
+
+# create a git repo to be used for verification
+git init verify.$MODULE_NAME
+cd verify.$MODULE_NAME
+cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
+
+python ../cvs2svn-trunk/contrib/git-move-refs.py
+git prune
+git repack -a -d --depth=250 --window=250
+git gc --aggressive
+git repack -a -d --depth=250 --window=250
+
+# verify the repo - this can take long, so for your first test skip this step.
+cd $ROOT
+rm -rf compare-tmp
+mkdir compare-tmp
+python $ROOT/cvs2svn-trunk/contrib/verify-cvs2svn.py \
+--git $CVS_LOC/e4/$MODULE_NAME \
+$ROOT/verify.$MODULE_NAME \
+--tmp=$ROOT/compare-tmp --diff >$MIGR_PASS/compare-log.txt 2>&1 &
+
+# create a git repo to continue the conversion
+cd $ROOT
+git init target.$MODULE_NAME
+cd target.$MODULE_NAME
+
+cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
+python ../cvs2svn-trunk/contrib/git-move-refs.py
+git prune
+git repack -a -d --depth=250 --window=250
+git gc --aggressive
+git repack -a -d --depth=250 --window=250
+
+
+
+# Fixing the Delete only tags:
+cd $ROOT/target.$MODULE_NAME
+/bin/bash $MIGR/scripts/fix_tags.sh >$MIGR_PASS/tag_report.sh
+grep ^git $MIGR_PASS/tag_report.sh >$MIGR_PASS/mv_tags.sh
+# examine them
+/bin/bash $MIGR_PASS/mv_tags.sh
+
+# now examine the repo, hopefully the tags and branches that we care about are in decent shape.
+# In my case, I see Cherrypick markers for a couple of tags. When the conversion is complete and most
+# people are happy, a developer will have to examine these commits to see if they
+# can be simplified.
+
+grep ^Cherry $MIGR_PASS/tag_report.sh >$MIGR_PASS/tag_cherrypicks.txt
+grep "R[34]_" $MIGR_PASS/tag_cherrypicks.txt
+# No changes here
+
+git branch >$MIGR_PASS/branches.txt
+git tag >$MIGR_PASS/tags.txt
+
+cd $ROOT
+cat - >gitignore <<EOF
+bin/
+*~
+*.rej
+*.bak
+core
+*.patch
+javacore.*
+heapdump.*
+core.*
+Snap.*
+target/
+
+EOF
+
+cd target.$MODULE_NAME
+
+# from http://stackoverflow.com/questions/3895453/how-do-i-make-a-git-commit-in-the-past
+rm -f t1.txt
+git checkout master
+
+new_file=$(git hash-object -w ../gitignore)
+git filter-branch \
+--index-filter \
+'git update-index --add --cacheinfo 100644 '"$new_file"' .gitignore' \
+--tag-name-filter cat \
+-- --all
+
+git reset --hard
+
+#create deploy
+cd $ROOT
+git clone --bare target.$MODULE_NAME deploy.$MODULE_NAME
+cd deploy.$MODULE_NAME
+git remote rm origin
+git config -l
+git config --add core.sharedrepository 1
+
+#final pack and prune step
+git prune
+git repack -a -d --depth=250 --window=250
+git gc --aggressive
+git repack -a -d --depth=250 --window=250
+
+cd $ROOT
+scp -r deploy.$MODULE_NAME pwebster@git.eclipse.org:/gitroot/e4/${MODULE_NAME}.git
+#
+# DONE, org.eclipse.e4.ui
+#
+
+
