[Pkg-fonts-devel] merge alioth and upstream git repo

[Hideki Yamane <henrich@debian.or.jp>]

Hi,

 I've merged upstream git and alioth repo as below steps.
 Just FYI, please let me know I can improve it.

----------------------------------------------------------------------------
git clone -o upstream https://github.com/johanmattssonm/birdfont.git
cd birdfont
git remote add alioth git+ssh://anonscm.debian.org/git/pkg-fonts/birdfont/
git pull alioth
git checkout alioth/master
git checkout -b debian/sid
git checkout pristine-tar
git remote remove alioth
git checkout debian/sid
git merge v2.12.0
for i in `git status |grep "both added"|awk '{print $3;}'`; do git checkout v2.12.0 $i; done
git rm `git diff -U v2.12.0 |filterdiff -x */debian/*|grep +++| awk '{print $2}'|sed -e s%^b/%%`
dch -v 2.12.0-1
git commit debian/changelog 

(ssh git.debian.org; rm -rf git.debian.org/git/pkg-fonts/birdfont.git)

gbp create-remote-repo --remote-url-pattern=ssh://git.debian.org/git/pkg-fonts/birdfont.git
git push --all


-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane