Re: 4.6 branches created in git again

2011-03-22 Thread Thiago Macieira
Em terça-feira, 22 de março de 2011, às 16:41:14, Thiago Macieira escreveu: > Em domingo, 20 de março de 2011, às 13:38:40, Albert Astals Cid escreveu: > > Can you please be careful and do not create incorrectly 4.6 branches in > > places where the branch is called KDE/4.6 (e.g kdelibs and kde-runt

Re: 4.6 branches created in git again

2011-03-22 Thread Thiago Macieira
Em domingo, 20 de março de 2011, às 13:38:40, Albert Astals Cid escreveu: > Can you please be careful and do not create incorrectly 4.6 branches in > places where the branch is called KDE/4.6 (e.g kdelibs and kde-runtime) > > Ian can you kill them? BTW, the only reason why they are there is becaus

Re: 4.6 branches created in git again

2011-03-22 Thread Frederik Schwarzer
On 22/03/2011, Ian Monroe wrote: > On Mon, Mar 21, 2011 at 18:13, Alex Merry wrote: >> On 21/03/11 20:17, Alexander Neundorf wrote: >>> >>> On Monday 21 March 2011, Ian Monroe wrote: Ben did add this block to his hook. Hooray. :) I'm thinking I should just go ahead and rename

Re: 4.6 branches created in git again

2011-03-22 Thread Ian Monroe
On Mon, Mar 21, 2011 at 18:13, Alex Merry wrote: > On 21/03/11 20:17, Alexander Neundorf wrote: >> >> On Monday 21 March 2011, Ian Monroe wrote: >>> >>> Ben did add this block to his hook. Hooray. :) >>> >>> I'm thinking I should just go ahead and rename KDE/4.6 to 4.6 etc. >> >> Wasn't the conclu

Re: 4.6 branches created in git again

2011-03-22 Thread Oswald Buddenhagen
On Tue, Mar 22, 2011 at 08:46:03AM -0500, Ian Monroe wrote: > On Mon, Mar 21, 2011 at 15:17, Oswald Buddenhagen wrote: > > On Mon, Mar 21, 2011 at 02:09:23PM -0500, Ian Monroe wrote: > >> (making sure local branches track the correct remote branches, > >> > > nothing to be done here. > > really?

Re: 4.6 branches created in git again

2011-03-22 Thread Ian Monroe
On Mon, Mar 21, 2011 at 15:17, Oswald Buddenhagen wrote: > On Mon, Mar 21, 2011 at 02:09:23PM -0500, Ian Monroe wrote: >> (making sure local branches track the correct remote branches, >> > nothing to be done here. really? you can't change what happens when you type 'git push' ? > only caveat: i

Re: 4.6 branches created in git again

2011-03-22 Thread Lydia Pintscher
We have a lot of people in our community who have not worked with git at all yet or only for a few days. Talking down on them is not helping. Neither does it make them learn git nor does it make them like git. So lets try to teach them so they can actually continue their work on KDE. Their knowledg

Re: 4.6 branches created in git again

2011-03-21 Thread Alex Merry
On 21/03/11 20:17, Alexander Neundorf wrote: On Monday 21 March 2011, Ian Monroe wrote: Ben did add this block to his hook. Hooray. :) I'm thinking I should just go ahead and rename KDE/4.6 to 4.6 etc. Wasn't the conclusion more like going with the longer name, i.e. KDE/4.6 ? That's what I u

Re: 4.6 branches created in git again

2011-03-21 Thread Tom Albers
- Original Message - > On Mon, Mar 21, 2011 at 08:24:24PM +, Tom Albers wrote: > > I'm a team player, that means I trust on others to educate me, > > correct me > > > you may have noticed that all the job ads looking for team players > also > emphasize independence and self-motivation.

Re: 4.6 branches created in git again

2011-03-21 Thread Oswald Buddenhagen
On Mon, Mar 21, 2011 at 08:24:24PM +, Tom Albers wrote: > I'm a team player, that means I trust on others to educate me, correct me > you may have noticed that all the job ads looking for team players also emphasize independence and self-motivation. i.e., the ability to complete day-to-day task

Re: 4.6 branches created in git again

2011-03-21 Thread Richard Moore
On Mon, Mar 21, 2011 at 8:19 PM, Oswald Buddenhagen wrote:> it's one thing not to know everything inside out and another not to > understand what a ref actually is ... > Please define it - I don't. Rich.

Re: 4.6 branches created in git again

2011-03-21 Thread Albert Astals Cid
A Dilluns, 21 de març de 2011, Oswald Buddenhagen va escriure: > On Mon, Mar 21, 2011 at 07:06:51PM +, Tom Albers wrote: > > Git might be known by you inside out, but please note that is not the > > case for everyone. > > it's one thing not to know everything inside out and another not to > un

Re: 4.6 branches created in git again

2011-03-21 Thread Tom Albers
- Original Message - > On Mon, Mar 21, 2011 at 07:06:51PM +, Tom Albers wrote: > > Git might be known by you inside out, but please note that is not > > the > > case for everyone. > > > it's one thing not to know everything inside out and another not to > understand what a ref actually

Re: 4.6 branches created in git again

2011-03-21 Thread Alexander Neundorf
On Monday 21 March 2011, Ian Monroe wrote: > On Sun, Mar 20, 2011 at 09:17, Ian Monroe wrote: > > On Sun, Mar 20, 2011 at 09:09, Andreas Hartmetz wrote: > >> On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > >>> Can you please be careful and do not create incorrectly 4.6 branches in >

Re: 4.6 branches created in git again

2011-03-21 Thread Oswald Buddenhagen
On Mon, Mar 21, 2011 at 07:06:51PM +, Tom Albers wrote: > Git might be known by you inside out, but please note that is not the > case for everyone. > it's one thing not to know everything inside out and another not to understand what a ref actually is ...

Re: 4.6 branches created in git again

2011-03-21 Thread Oswald Buddenhagen
On Mon, Mar 21, 2011 at 02:09:23PM -0500, Ian Monroe wrote: > (making sure local branches track the correct remote branches, > nothing to be done here. only caveat: if people actually pushed different things to the branches, we already have internal 4.6 forks. means you have to git merge the dying

Re: 4.6 branches created in git again

2011-03-21 Thread Ian Monroe
On Mon, Mar 21, 2011 at 13:41, Oswald Buddenhagen wrote: > On Mon, Mar 21, 2011 at 05:57:03PM +, Tom Albers wrote: >> Though if it needs a reclone for everyone we need to pick a date and >> *communicate* it. Let's say this weekend? >> > reclone? hello? >  git fetch >  git checkout 4.6 Yea, o

Re: 4.6 branches created in git again

2011-03-21 Thread Tom Albers
- Original Message - > On Mon, Mar 21, 2011 at 05:57:03PM +, Tom Albers wrote: > > Though if it needs a reclone for everyone we need to pick a date and > > *communicate* it. Let's say this weekend? > > > reclone? hello? I think I've stated my question in a way that makes clear that I d

Re: 4.6 branches created in git again

2011-03-21 Thread Oswald Buddenhagen
On Mon, Mar 21, 2011 at 05:57:03PM +, Tom Albers wrote: > Though if it needs a reclone for everyone we need to pick a date and > *communicate* it. Let's say this weekend? > reclone? hello? git fetch git checkout 4.6

Re: 4.6 branches created in git again

2011-03-21 Thread Tom Albers
- Original Message - > Come to think of it, perhaps it's the Release Team who should have > final say > on the branch naming, they may have requirements that we haven't > thought of? I think I can say on behalf of the release-team, that we don't care much as long as it is consistent over

Re: 4.6 branches created in git again

2011-03-21 Thread John Layt
On Monday 21 Mar 2011 14:19:09 Ian Monroe wrote: > Ben did add this block to his hook. Hooray. :) Yay, thanks Ben! Mental note to buy Ben yet another beer at Akademy. > I'm thinking I should just go ahead and rename KDE/4.6 to 4.6 etc. Do we know what the consequences are? Does this damage th

Re: 4.6 branches created in git again

2011-03-21 Thread Ian Monroe
On Sun, Mar 20, 2011 at 09:17, Ian Monroe wrote: > On Sun, Mar 20, 2011 at 09:09, Andreas Hartmetz wrote: >> On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: >>> Can you please be careful and do not create incorrectly 4.6 branches in >>> places where the branch is called KDE/4.6 (e.g kde

Re: 4.6 branches created in git again

2011-03-20 Thread Thiago Macieira
On Sunday, 20 de March de 2011 15:09:26 Andreas Hartmetz wrote: > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > > Can you please be careful and do not create incorrectly 4.6 branches in > > places where the branch is called KDE/4.6 (e.g kdelibs and kde-runtime) > > > > Ian can you ki

Re: 4.6 branches created in git again

2011-03-20 Thread Ingo Klöcker
On Sunday 20 March 2011, Parker Coates wrote: > On Sun, Mar 20, 2011 at 10:57, Ian Monroe wrote: > > On Sun, Mar 20, 2011 at 09:45, John Tapsell wrote: > >> Why do we let people create branches on the main git server > >> anyway? > > > > Well for feature branches its fine and kind of the point of

Re: 4.6 branches created in git again

2011-03-20 Thread Eike Hein
On 03/20/2011 04:17 PM, John Tapsell wrote: By having it in your own git repository. This is how Qt does it. Anyone can clone the Qt repository on the server and create branches in their own clone. For example, here is mine: http://qt.gitorious.org/~johnflux- and other people can (and do) w

Re: 4.6 branches created in git again

2011-03-20 Thread John Layt
On Sunday 20 Mar 2011 15:02:49 Alexander Neundorf wrote: > On Sunday 20 March 2011, Parker Coates wrote: > > On Sun, Mar 20, 2011 at 10:09, Andreas Hartmetz wrote: > > > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > > >> Can you please be careful and do not create incorrectly 4.6 bran

Re: 4.6 branches created in git again

2011-03-20 Thread John Tapsell
On 20 March 2011 15:01, Albert Astals Cid wrote: > A Diumenge, 20 de març de 2011, John Tapsell va escriure: >> Why do we let people create branches on the main git server anyway? > > How are you supposed to work on a feature-branch otherwise? By having it in your own git repository. This is how

Re: 4.6 branches created in git again

2011-03-20 Thread Andreas Hartmetz
On Sunday 20 March 2011 15:59:55 Parker Coates wrote: > On Sun, Mar 20, 2011 at 10:09, Andreas Hartmetz wrote: > > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > >> Can you please be careful and do not create incorrectly 4.6 branches in > >> places where the branch is called KDE/4.6 (e

Re: 4.6 branches created in git again

2011-03-20 Thread Alexander Neundorf
On Sunday 20 March 2011, Parker Coates wrote: > On Sun, Mar 20, 2011 at 10:09, Andreas Hartmetz wrote: > > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > >> Can you please be careful and do not create incorrectly 4.6 branches in > >> places where the branch is called KDE/4.6 (e.g kdeli

Re: 4.6 branches created in git again

2011-03-20 Thread John Layt
On Sunday 20 Mar 2011 14:28:11 Andreas Hartmetz wrote: > On Sunday 20 March 2011 15:17:11 Ian Monroe wrote: > > On Sun, Mar 20, 2011 at 09:09, Andreas Hartmetz wrote: > > > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > > >> Can you please be careful and do not create incorrectly 4.6

Re: 4.6 branches created in git again

2011-03-20 Thread Parker Coates
On Sun, Mar 20, 2011 at 10:57, Ian Monroe wrote: > On Sun, Mar 20, 2011 at 09:45, John Tapsell wrote: >> Why do we let people create branches on the main git server anyway? > > Well for feature branches its fine and kind of the point of git. > There's no reason to let non-admins create version bran

Re: 4.6 branches created in git again

2011-03-20 Thread Parker Coates
On Sun, Mar 20, 2011 at 10:09, Andreas Hartmetz wrote: > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: >> Can you please be careful and do not create incorrectly 4.6 branches in >> places where the branch is called KDE/4.6 (e.g kdelibs and kde-runtime) >> >> Ian can you kill them? > > M

Re: 4.6 branches created in git again

2011-03-20 Thread Ian Monroe
On Sun, Mar 20, 2011 at 09:45, John Tapsell wrote: > Why do we let people create branches on the main git server anyway? > Well for feature branches its fine and kind of the point of git. There's no reason to let non-admins create version branches though. Ian

Re: 4.6 branches created in git again

2011-03-20 Thread Albert Astals Cid
A Diumenge, 20 de març de 2011, John Tapsell va escriure: > Why do we let people create branches on the main git server anyway? How are you supposed to work on a feature-branch otherwise? Albert

Re: 4.6 branches created in git again

2011-03-20 Thread John Tapsell
Why do we let people create branches on the main git server anyway?

Re: 4.6 branches created in git again

2011-03-20 Thread Andreas Hartmetz
On Sunday 20 March 2011 15:17:11 Ian Monroe wrote: > On Sun, Mar 20, 2011 at 09:09, Andreas Hartmetz wrote: > > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > >> Can you please be careful and do not create incorrectly 4.6 branches in > >> places where the branch is called KDE/4.6 (e.g

Re: 4.6 branches created in git again

2011-03-20 Thread Ian Monroe
On Sun, Mar 20, 2011 at 09:09, Andreas Hartmetz wrote: > On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: >> Can you please be careful and do not create incorrectly 4.6 branches in >> places where the branch is called KDE/4.6 (e.g kdelibs and kde-runtime) >> >> Ian can you kill them? >> >

Re: 4.6 branches created in git again

2011-03-20 Thread Andreas Hartmetz
On Sunday 20 March 2011 14:38:40 Albert Astals Cid wrote: > Can you please be careful and do not create incorrectly 4.6 branches in > places where the branch is called KDE/4.6 (e.g kdelibs and kde-runtime) > > Ian can you kill them? > > Albert Maybe we can go through with renaming the branches t

4.6 branches created in git again

2011-03-20 Thread Albert Astals Cid
Can you please be careful and do not create incorrectly 4.6 branches in places where the branch is called KDE/4.6 (e.g kdelibs and kde-runtime) Ian can you kill them? Albert