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 1518d27..3a8ffb6 100644
--- a/scripts/migration_script.sh
+++ b/scripts/migration_script.sh
@@ -176,6 +176,8 @@
git gc --aggressive
git repack -a -d --depth=250 --window=250
+git tag -d 'TC/EJPsnapshot134a'
+
# verify the repo - started on work linux box
cd $ROOT
mkdir compare-tmp
@@ -204,6 +206,7 @@
git tag -d 'R3_6_api_cleanup_<build_20091125>'
git tag 'R3_6_p2_api_cleanup_20091216' 'R3_6_p2_api_cleanup_<20091216>'
git tag -d 'R3_6_p2_api_cleanup_<20091216>'
+git tag -d 'TC/EJPsnapshot134a'
# Fixing the Delete only tags:
cd $ROOT
@@ -373,24 +376,21 @@
##################################################
-# next, eclipse.platform.ui.e4 - graduated Eclipse4 UI bundles
+# next, eclipse.platform.ui.e4 - graduated Eclipse4 UI bundles + compat layer
MODULE_NAME=eclipse.platform.ui.e4
cd $ROOT
-CVS_LOC=$ROOT/cvsroot.$MODULE_NAME
-mkdir -p $CVS_LOC/e4
-cd $CVS_LOC
-cvs -d :local:$(pwd) init
+#CVS_LOC=$ROOT/cvsroot.$MODULE_NAME
+#mkdir -p $CVS_LOC/e4
+#cd $CVS_LOC
+#cvs -d :local:$(pwd) init
+# using existing version for this pass, put compat workbench in it
-MIGR_PASS=$MIGR/$MODULE_NAME/pass3
-$MIGR/scripts/copy_e4.sh $MIGR_PASS/modules_platform_ui.sh $CVS_LOC
+MIGR_PASS=$MIGR/$MODULE_NAME/pass4
+#$MIGR/scripts/copy_e4.sh $MIGR_PASS/modules_platform_ui.sh $CVS_LOC
# fix up the compat tests that moved into platform ui
-cd $CVS_LOC/e4
-mv org.eclipse.e4.compatibility/tests/* org.eclipse.e4.ui/tests
-mv org.eclipse.e4.compatibility/features/org.eclipse.e4.rcp/ org.eclipse.e4.ui/features
-#confirm there's nothing else in there
-find org.eclipse.e4.compatibility/ -type f
+# already done
# clean the CVS repo of links
@@ -428,6 +428,7 @@
--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
@@ -463,8 +464,6 @@
-
-
##################################################
# next, eclipse.platform.runtime.e4 - graduated Eclipse4 core bundles
MODULE_NAME=eclipse.platform.runtime.e4
@@ -692,88 +691,8 @@
##################################################
-# next, eclipse.platform.ui.compat - The ui.workbench fork
-MODULE_NAME=eclipse.platform.ui.compat
+# next, eclipse.platform.ui.compat - The ui.workbench fork - just rolled it into 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_compat.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
-
-# the last step for this one is to be merged into eclipse.platform.ui and grafted on random places
##################################################
# Let's do eclipse.platform.runtime so core has a place to go
@@ -1029,7 +948,7 @@
MODULE_NAME=eclipse.platform.ui
MIGR_PASS=$MIGR/$MODULE_NAME/pass3
-MIGR_E4_PASS=$MIGR/${MODULE_NAME}.e4/pass3
+MIGR_E4_PASS=$MIGR/${MODULE_NAME}.e4/pass4
cd $ROOT
rm -f t1 t2
@@ -1068,23 +987,25 @@
# add back any tags. You have to manually look at the history, diff doesn't help
git log --boundary --pretty=oneline --decorate master..R4_HEAD >$MIGR_PASS/R4_HEAD_new.txt
# comparing them in gedit gives:
-git tag -f v20110614-1530_ui 6ec17d932dcb27a5d81c340c4c7d86de809fcd04
-git tag -f R4_1_ui 6ec17d932dcb27a5d81c340c4c7d86de809fcd04
-git tag -f v20110613-2030_ui e0eabf8224fda9bb90c9c4439473ac74b16e7af8
-git tag -f v20110506-1500_ui 43fce3201cf11cbec240e57a8de33546465ad6d7
-git tag -f v20110304-1630_ui 4a3dfd573d6d3d448619764ca802aae6d7a93802
-git tag -f v20100924-1330_ui e74d12694b3ed644d86649198eb8f3defa284e59
-git tag -f v20100714-1430_ui b60d29c95acd5d06d4ce0a8695c156769d8432cd
-git tag -f v20100712-1900_ui b60d29c95acd5d06d4ce0a8695c156769d8432cd
-git tag -f R4_0_ui b60d29c95acd5d06d4ce0a8695c156769d8432cd
-git tag -f R0_10_ui b60d29c95acd5d06d4ce0a8695c156769d8432cd
-git tag -f v20100712-1400 79c98b424e41ea8ce45dc836265ad91fb9b8de44
+git tag -f v20110614-1530_ui 41e640fd2ad259b48d7a9b28e9355c2e7c20d285
+git tag -f R4_1_ui 41e640fd2ad259b48d7a9b28e9355c2e7c20d285
+git tag -f v20110613-2030_ui 6894fa950df61331dfb3db429bbbfcf6df6b8d39
+git tag -f v20110506-1500_ui 9ac8056bf5a9354bc126ae02c9019af07e24a303
+git tag -f v20110304-1630_ui 99cf89b77105884bef7a596f1a3223de15985f2a
+git tag -f v20100924-1330_ui 6e2f2ea35a811e6823d0afa1fa382f037285725e
+git tag -f v20100714-1430_ui 6f7a4a4d5ad0af130c5026ee78efe5ebf4089677
+git tag -f v20100712-1900_ui 6f7a4a4d5ad0af130c5026ee78efe5ebf4089677
+git tag -f R4_0_ui 6f7a4a4d5ad0af130c5026ee78efe5ebf4089677
+git tag -f R0_10_ui 6f7a4a4d5ad0af130c5026ee78efe5ebf4089677
+git tag -f v20100712-1400 36424bbc9647b8fa8a92645a8841be235dbd53e0
# if you are creating the main repo, you're OK
+git checkout master
+git merge R4_HEAD
# merge org.eclipse.ui/R4_HEAD into the 4.2 master
# did it using EGit and the http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_conflict
@@ -1098,6 +1019,15 @@
git fetch e4
git merge e4/master
+git status >$MIGR_PASS/merge_e4_ui_status.txt
+# find a list of what was merged and conflicts
+vi $MIGR_PASS/merge_e4_ui_status.txt
+
+# just take the e4 workbench
+git checkout --theirs bundles/org.eclipse.ui.workbench
+git commit
+
+
# turn remote branches from e4.ui into local branches
rm -f $MIGR_PASS/localize_e4_branches.sh
@@ -1115,39 +1045,69 @@
#
-##################################################
-# eclipse.platform.ui : merge in eclipse.platform.ui.compat - this turned out to be a bad idea
+# Now the final prep, eh?
+git branch -d R4_HEAD
+git tag pre_R4_HEAD_merge 3b015a2825106dc0335edf3f3698f0f90c6a5cb9
+git branch R3_development pre_R4_HEAD_merge
+git branch R4_development master
+git tag R4_1_mainenance_tag R4_1_maintenance
+git branch -D R4_1_maintenance
-MODULE_NAME=eclipse.platform.ui
-MIGR_PASS=$MIGR/$MODULE_NAME/pass3
-MIGR_E4_PASS=$MIGR/${MODULE_NAME}.compat/pass3
-# we've merged in a lot of stuff, let's review
-cd target.$MODULE_NAME
-
-git branch >$MIGR_PASS/merge_branches.txt
-git tag >$MIGR_PASS/merge_tags.txt
cd $ROOT
-rm -f t1 t2
-sort -u $MIGR_PASS/merge_tags.txt >t1
-sort -u $MIGR_E4_PASS/tags.txt >t2
-comm -12 t1 t2 >$MIGR_PASS/common_compat_tags.txt
+cat - >gitignore <<EOF
+bin/
+*~
+*.rej
+*.bak
+core
+*.patch
+javacore.*
+heapdump.*
+core.*
+Snap.*
+target/
-# normally we would clean up the smaller repo, but it turns out these are
-# just tags on one bundle, so we'll move them in the new repo:
+EOF
cd target.$MODULE_NAME
-for TAG in $( cat $MIGR_PASS/common_compat_tags.txt ); do
- git tag ${TAG}_compat ${TAG}
- git tag -d ${TAG}
-done
+# 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
+
+git checkout master
+git reset --hard R3_development
+
+
+#create deploy
cd $ROOT
-rm -f t1 t2
-sort -u $MIGR_PASS/merge_branches.txt >t1
-sort -u $MIGR_E4_PASS/branches.txt >t2
-comm -12 t1 t2 >$MIGR_PASS/common_compat_branches.txt
+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
-# Only has branch master in common, that's not a problem
+git reflog expire --all
+rm -rf refs/original
+#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
+
+rm -f gitk.cache
+
+# cut, ship, and print
+scp -r * pwebster@git.eclipse.org:/gitroot/platform/${MODULE_NAME}.git
