From: Serhat Sevki Dincer <jfcgauss@gmail.com>
Date: Sat, 11 Feb 2012 10:19:43 GMT
Subject: Re: git svn problem
Message-ID: <CAPqC6xR9LFgx4r1t0misYavPe8sky=VJf39N29CU-66Re7zL-Q@mail.gmail.com>
In-Reply-To: <CAPqC6xSJ7pfUQJz8FQ743mJMNmZyfJfWxutOnt+FVkP76eXOGw@mail.gmail.com>

Ok, I figured out the rest, in case someone needs it:

> I have the following at the moment:
>
> rm -rf plone.app.locales ; mkdir plone.app.locales ; cd plone.app.locales
> git svn init -T trunk http://svn.plone.org/svn/plone/plone.app.locales
> touch start ; git add start ; git commit -m start
> git svn fetch -r49624:HEAD
> git rebase --onto master --root trunk --preserve-merges
> git checkout -b plone

# edit .git/config: s#/plone/#/collective/#  s#remotes/trunk#remotes/trunkcol#

git checkout master
git svn fetch -r248302:HEAD
git rebase --onto plone --root trunkcol --preserve-merges
git checkout -b collective
git branch -d master plone