Re: svn-merge.py and git

2011-02-06 Thread Nuno Pinheiro
A Domingo, 6 de Fevereiro de 2011 14:55:18 Martin Gräßlin você escreveu: > On Sunday 06 February 2011 15:47:05 Arno Rehn wrote: > > On Sunday 06 February 2011 14:13:57 Hugo Pereira Da Costa wrote: > > > my idea at that > > > time was that oxygen-transparent would get merged back to trunk/master > >

Re: svn-merge.py and git

2011-02-06 Thread Arno Rehn
On Sunday 06 February 2011 14:13:57 Hugo Pereira Da Costa wrote: > my idea at that > time was that oxygen-transparent would get merged back to trunk/master at > some point, but this will not happen Slighty off-topic, but why's that? I've always looked forward to seeing oxygen-transparent being off

Re: svn-merge.py and git

2011-02-06 Thread Martin Gräßlin
On Sunday 06 February 2011 15:47:05 Arno Rehn wrote: > On Sunday 06 February 2011 14:13:57 Hugo Pereira Da Costa wrote: > > my idea at that > > time was that oxygen-transparent would get merged back to trunk/master at > > some point, but this will not happen > > Slighty off-topic, but why's that?

Re: svn-merge.py and git

2011-02-06 Thread Hugo Pereira Da Costa
On Sunday 06 February 2011 15:47:05 Arno Rehn wrote: > On Sunday 06 February 2011 14:13:57 Hugo Pereira Da Costa wrote: > > my idea at that > > time was that oxygen-transparent would get merged back to trunk/master at > > some point, but this will not happen > > Slighty off-topic, but why's that?

Re: svn-merge.py and git

2011-02-06 Thread Tom Albers
- Original Message - > On Sunday 06 February 2011 14:00:38 Artur de Souza wrote: > > Hi Hugo! > > > > Quoting Hugo Pereira Da Costa : > > > 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

Re: svn-merge.py and git

2011-02-06 Thread Hugo Pereira Da Costa
On Sunday 06 February 2011 14:00:38 Artur de Souza wrote: > Hi Hugo! > > Quoting Hugo Pereira Da Costa : > > 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 wou

Re: svn-merge.py and git

2011-02-06 Thread Artur de Souza
Hi Hugo! Quoting Hugo Pereira Da Costa : 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 rebasi

svn-merge.py and git

2011-02-06 Thread Hugo Pereira Da Costa
Hello all, another question about git. Some time ago, I "forked" oxygen to playground/artwork/oxygen-transparent in order to have a version of oxygen that supports ARGB windows and transparency. I was keeping the source in sync with official oxygen (cause the amount of changes needed for this A