scripts/merge_e4_into_ui.txt

# attempt to merge eclipse.platform.ui/  eclipse.platform.ui.e4/

# in this merge, we simply pull both repos together and then
# merge them onto head

cd eclipse.platform.ui
git tag | sort -u >../tags_ui.txt
cd ../eclipse.platform.ui.e4/
git tag | sort -u >../tags_e4.txt
cd ..
comm -12 tags_ui.txt  tags_e4.txt >common_tags.txt
cd eclipse.platform.ui
git branch -r | sort -u >../branch_ui.txt
cd ../eclipse.platform.ui.e4/
git branch -r | sort -u >../branch_e4.txt
cd ..
comm -12 branch_ui.txt branch_e4.txt >common_branches.txt

#Clean up the tags out of the eclipse.platform.ui repo
#Probably branches as well.

cd eclipse.platform.ui
for f in $( cat ../common_tags.txt ) ; do git tag ${f}_37 ${f}; git tag -d $f ; done
git remote add e4 ../eclipse.platform.ui.e4
git fetch e4
git merge e4/master


# Then since master now points to the last commit in e4, 
# the push will push everything back to the main repo
git push --all origin
git push --tags origin