Re: Policy on git feature branches

2011-02-01 Thread Sebastian Trüg
On 02/01/2011 01:21 PM, Andreas Pakulat wrote: > On 01.02.11 13:05:49, Sebastian Trüg wrote: >> On 02/01/2011 11:11 AM, Andreas Pakulat wrote: >>> On 01.02.11 10:21:01, Sebastian Trüg wrote: Hi list, I have been working on an improvement for Nepomuk via git-svn for a while now a

Re: Policy on git feature branches

2011-02-01 Thread Andreas Pakulat
On 01.02.11 13:05:49, Sebastian Trüg wrote: > On 02/01/2011 11:11 AM, Andreas Pakulat wrote: > > On 01.02.11 10:21:01, Sebastian Trüg wrote: > >> Hi list, > >> > >> I have been working on an improvement for Nepomuk via git-svn for a > >> while now and would now like to push it to kde-runtime. > >

Re: Policy on git feature branches

2011-02-01 Thread Sebastian Trüg
On 02/01/2011 11:11 AM, Andreas Pakulat wrote: > On 01.02.11 10:21:01, Sebastian Trüg wrote: >> Hi list, >> >> I have been working on an improvement for Nepomuk via git-svn for a >> while now and would now like to push it to kde-runtime. > > If the branch has been created via git-svn you cannot me

Re: Policy on git feature branches

2011-02-01 Thread Andreas Pakulat
On 01.02.11 10:21:01, Sebastian Trüg wrote: > Hi list, > > I have been working on an improvement for Nepomuk via git-svn for a > while now and would now like to push it to kde-runtime. If the branch has been created via git-svn you cannot merge it properly. You need to cherry-pick all commits. >

Re: Policy on git feature branches

2011-02-01 Thread John Tapsell
On 1 February 2011 09:21, Sebastian Trüg wrote: > Hi list, > > I have been working on an improvement for Nepomuk via git-svn for a > while now and would now like to push it to kde-runtime. > However, I would prefer to keep the commit history and backport to 4.6. > Thus, I thought of pushing my fea

Policy on git feature branches

2011-02-01 Thread Sebastian Trüg
Hi list, I have been working on an improvement for Nepomuk via git-svn for a while now and would now like to push it to kde-runtime. However, I would prefer to keep the commit history and backport to 4.6. Thus, I thought of pushing my feature branch into the kde-runtime repository and then merge i