Re: Empty merges per release

2011-04-28 Thread Alexander Neundorf
On Wednesday 27 April 2011, John Layt wrote: > On Wednesday 27 Apr 2011 19:59:05 Alexander Neundorf wrote: > > I mean, I can help with simple things. > > > > If we agree that the following pages should be gone > > http://techbase.kde.org/Development/Tutorials/Git Done. I.e. I made the page empty (

Re: Empty merges per release

2011-04-27 Thread John Layt
On Wednesday 27 Apr 2011 19:59:05 Alexander Neundorf wrote: > I mean, I can help with simple things. > > If we agree that the following pages should be gone > http://techbase.kde.org/Development/Tutorials/Git > http://techbase.kde.org/Development/Tutorials/Git/Pushing > http://techbase.kde.org/Dev

Re: Empty merges per release

2011-04-27 Thread Alexander Neundorf
On Wednesday 27 April 2011, John Layt wrote: > On Wednesday 27 Apr 2011 17:52:32 Alexander Neundorf wrote: > > On Wednesday 27 April 2011, Thiago Macieira wrote: > > > I know we decided to use cherry-picks to bring commits from past > > > versions to master, > > > > Is this what is described here ?

Re: Empty merges per release

2011-04-27 Thread John Layt
On Wednesday 27 Apr 2011 17:52:32 Alexander Neundorf wrote: > On Wednesday 27 April 2011, Thiago Macieira wrote: > > I know we decided to use cherry-picks to bring commits from past versions > > to master, > > Is this what is described here ? > http://techbase.kde.org/Development/Tutorials/Git/Rec

Re: Empty merges per release

2011-04-27 Thread Alexander Neundorf
On Wednesday 27 April 2011, Thiago Macieira wrote: > I know we decided to use cherry-picks to bring commits from past versions > to master, Is this what is described here ? http://techbase.kde.org/Development/Tutorials/Git/Recipes Our git docs are still not in good shape: http://techbase.kde.o

Re: Empty merges per release

2011-04-27 Thread Oswald Buddenhagen
On Wed, Apr 27, 2011 at 12:17:48PM -, Tom Albers wrote: > - Original Message - > > (oh well, who cares, given all that scripty crap in the history) > > I consider our translations very important for KDE. Would be nice if > people -in general- do not consider translations and the contri

Re: Empty merges per release

2011-04-27 Thread Tom Albers
- Original Message - > (oh well, who > cares, > given all that scripty crap in the history) I consider our translations very important for KDE. Would be nice if people -in general- do not consider translations and the contributors working on that as second class community members. Callin

Re: Empty merges per release

2011-04-27 Thread Thiago Macieira
Em Wednesday, 27 de April de 2011, às 12:46:40, Oswald Buddenhagen escreveu: > if you want to make that git feature useful in the kde-ish cherry-pick > regime, tag the stable branch points - if you want to know when a commit > on a stable branch hit master, you need the extra step of following the

Re: Empty merges per release

2011-04-27 Thread Oswald Buddenhagen
On Wed, Apr 27, 2011 at 09:40:08AM +0200, Thiago Macieira wrote: > I know we decided to use cherry-picks to bring commits from past versions to > master, but this has caused that the 4.5 and 4.6 commits are never in the > past > history of master. > which is the state we had with svn. it was co

Empty merges per release

2011-04-27 Thread Thiago Macieira
I know we decided to use cherry-picks to bring commits from past versions to master, but this has caused that the 4.5 and 4.6 commits are never in the past history of master. I recommend at least once, after a release, that the tag is merged back into master, using strategy "ours" if necessary.