svn-merge.py and git

[Hugo Pereira Da Costa]

On Sunday 06 February 2011 14:00:38 Artur de Souza wrote:
> Hi Hugo!
> 
> Quoting Hugo Pereira Da Costa <hugo at oxygen-icons.org>:
> > How can I achieve the same now that official oxygen is in git (in
> > kde-workspace)
> > ?
> 
> I don't know the best way of doing this between svn and git. If
> everything was in git I would say that the best shot would be to have
> it in a branch and keep rebasing your branch with master. If you make
> this branch public then you would keep merging the branch with master.
> 

I considered that, and that would really be the easiest, but ...
- I want people to be able to download (and possibly packagers to package) the 
fork

- in order to do that I actually renamed the pluggin names to oxygen-
transparent (and the style/deco to "Oxygen Transparent"). 
This was not the case in the past (where oxygen-transparent would simply 
overwrite your official oxygen, but thats really not good (my idea at that time 
was that oxygen-transparent would get merged back to trunk/master at some 
point, but this will not happen). 

now I don't think you want a "branch" of official code that installs pluggins 
with different names ... and different libraries, etc. 

> I know I didn't help much, but.. :P



> 
> Cheers,
> 
> Artur
> 
> -------------------------------------------