KDE development with git

[Paolo Capriotti]

On Friday 13 July 2007 01:54:39 Boyd Stephen Smith Jr. wrote:
> Yeah, there are numerous issues, but with some massaging I think you could
> get (e) working, at least most of the time.  I'd be open to helping you
> write the cron scripts to drive this.  This largest issue is that you
> should git-svn prefers that you rebase branches off a SVN branch, but
> rebase-ing a public branch should be done as little as possible to make
> downstream pull-ing easier.
>
> There numerous upsides to getting (e) working; I can see it being genuinely
> useful outside of your project and my work.

Yes, I agree that (e) would be fine, and is exactly what I tried to do in the 
first place, but failed.
The problem I have found is that I want to keep a public master branch in the 
git repository and never rebase it on top of the svn history. This way, while 
svn and git record the same commits, git cannot understand it is so, and 
every merge of git over svn is non-fast-forward even if it actually should 
be.
Doing it the over way round, i.e. rebasing svn on top of master, doesn't seem 
to work either.
I can see some flaws in the way git-svn is designed. I think it should keep 
track of a mapping between git commits and svn revisions, but maybe I'm 
missing something: I use git since only a month or so, and still have to 
grasp some of its concepts.
So, if you have some ideas on how to set (e) up, any help is appreciated.

Thank you,

Paolo Capriotti