Re: git branch audit - results ...

2012-07-23 Thread Jan Holesovsky
Hi Bjoern, On 2012-07-20 at 23:45 +0200, Bjoern Michaelsen wrote: > > origin/feature/gbuildfixes > > mostly mine. Whatever is in there is either merged or obsolete -> can be > deleted. I've done that; but please, everybody, is it as simple as: git push origin :feature/gbuildfixes If you ow

Re: git branch audit ...

2012-07-23 Thread Caolán McNamara
On Fri, 2012-07-20 at 17:03 +0100, Michael Meeks wrote: > On Thu, 2012-07-19 at 11:36 +0100, Caolán McNamara wrote: > > On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote: > > > origin/feature/cmclayouttrans > > > > A work in progress, to munge translating .ui files into our localization > >

Re: git branch audit - results ...

2012-07-20 Thread Bjoern Michaelsen
On Fri, Jul 20, 2012 at 05:15:27PM +0100, Michael Meeks wrote: > origin/feature/gbuild_mkdir Norberts, dunno. > origin/feature/gbuildfixes mostly mine. Whatever is in there is either merged or obsolete -> can be deleted. Best, Bjoern ___ LibreOf

Re: git branch audit - results ...

2012-07-20 Thread Rafael Dominguez
On Fri, Jul 20, 2012 at 11:45 AM, Michael Meeks wrote: > > Thanks for all the input, I tried to condense it; what I have is this. > After another > > git remote prune origin > > I see we're a lot cleaner now :-) but I still have these to delete > (will do that Monday absent

git branch audit - results ...

2012-07-20 Thread Michael Meeks
Thanks for all the input, I tried to condense it; what I have is this. After another git remote prune origin I see we're a lot cleaner now :-) but I still have these to delete (will do that Monday absent screams): * to-kill origin/feature/external_gbuild # ~o

Re: git branch audit ...

2012-07-20 Thread Michael Meeks
On Thu, 2012-07-19 at 11:36 +0100, Caolán McNamara wrote: > On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote: > > origin/feature/cmclayouttrans > > A work in progress, to munge translating .ui files into our localization > mechanism. Extraction of translatables done, re-insertion still a

Re: git branch audit ...

2012-07-19 Thread Lionel Elie Mamane
On Thu, Jul 19, 2012 at 08:17:35PM +0200, Matúš Kukan wrote: > On 18 July 2012 21:09, Lionel Elie Mamane wrote: >> On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: >>> origin/features/base-preview >> Mine. Regularly updated. > I think you are re-creating it each time ? Yeah, be

Re: git branch audit ...

2012-07-19 Thread Matúš Kukan
On 18 July 2012 21:09, Lionel Elie Mamane wrote: > On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: >> origin/features/base-preview > > Mine. Regularly updated. I think you are re-creating it each time ? Maybe you could fix typo and rename it next time when re-basing to feature/ba

Re: git branch audit ...

2012-07-19 Thread Norbert Thiebaud
On Wed, Jul 18, 2012 at 11:51 AM, Michael Meeks wrote: > origin/feature/accfixes2 acc2 cws... not to be merged any time soon... but still keeping it around would not hurt > origin/feature/coretext I've been doing some coretext support work in there.. but I have merged most of it I think...

Re: git branch audit ...

2012-07-19 Thread Markus Mohrhard
Hey, > origin/feature/cell-format-data-bar > origin/feature/cell-notes both obsolete now. > origin/feature/chart_errorbars Have to look at that one again. > origin/feature/gsoc_test_improvements > origin/feature/gsoc_test_improvements2 > origin/feature/gsoc_test_improvements3 Art

Re: git branch audit ...

2012-07-19 Thread Caolán McNamara
On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote: > origin/feature/cmclayouttrans A work in progress, to munge translating .ui files into our localization mechanism. Extraction of translatables done, re-insertion still a to-do :-) C. ___ Libre

Re: git branch audit ...

2012-07-19 Thread Stefan Knorr (Astron)
Hi Michael, all, these two branches can probably go too: origin/feature/line-numbers-in-basicIDE – merged some time before 3.5 origin/feature/masterpages – merged into 3.6 I am not 100% sure about this one, but I think it's merged too: origin/feature/cell-format-data-bar – Markus's colour scal

Re: git branch audit ...

2012-07-19 Thread Gökçen Eraslan
On 19-07-2012 11:44, Gökçen Eraslan wrote: > On 18-07-2012 19:51, Michael Meeks wrote: >> origin/feature/pdf-signing > > My GSoC branch is already merged into master. Actually, some Werror > fixes were applied to the master then, so this branch is ahead of master > by 2 or 3 commits and is safe

Re: git branch audit ...

2012-07-19 Thread Gökçen Eraslan
On 18-07-2012 19:51, Michael Meeks wrote: > origin/feature/pdf-signing My GSoC branch is already merged into master. Actually, some Werror fixes were applied to the master then, so this branch is ahead of master by 2 or 3 commits and is safe to remove if mentors (kendy, sberg, thorsten) are OK.

Re: git branch audit ...

2012-07-19 Thread Jan Holesovsky
Hi, On 2012-07-18 at 22:01 +0200, Fridrich Strba wrote: > I cherry-picked all from feature/crossmsi today, so the branch can > happily die. The same happy fate for feature/mspub which is merged. Picking this for the replay, but applies to everybody who knows of a obsolete branch. Just do git p

Re: git branch audit ...

2012-07-19 Thread David Tardon
On Thu, Jul 19, 2012 at 10:08:30AM +0200, Bjoern Michaelsen wrote: > On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: > > origin/feature/tail_build > > seems to be a integrated/obsolete branch by dtardon Yes, it has been integrated. Sorry, I have forgotten about than one entirely.

Re: git branch audit ...

2012-07-19 Thread Bjoern Michaelsen
On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: > origin/feature/masterpages integrated in -3-6 and master by Petr > origin/feature/tail_build seems to be a integrated/obsolete branch by dtardon > origin/feature/unitymenus upcoming feature branch, alive Best, Bjoern

Re: git branch audit ...

2012-07-19 Thread Thorsten Behrens
Michael Meeks wrote: > origin/feature/opengl-canvas > A somewhat working version of having canvas render entirely via opengl (and not just software-render to texture & then use OpenGL as a blitter on steroids). Most wanted currently: freetype text support. > origin/feature/coretext > origin/

Re: git branch audit ...

2012-07-18 Thread Fridrich Strba
I cherry-picked all from feature/crossmsi today, so the branch can happily die. The same happy fate for feature/mspub which is merged. Sent from Samsung Mobile Michael Meeks wrote: Hi guys, As I created a new git branch for some new work, I was interested to see a rather huge list of malinge

Re: git branch audit ...

2012-07-18 Thread Lionel Elie Mamane
On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: > origin/features/base-preview Mine. Regularly updated. The idea was to get a Windows tinderbox on that branch so that I could dogfood my commits to master in production (without getting the instability of other people's commits to m

Re: git branch audit ...

2012-07-18 Thread Kohei Yoshida
Hi Michael, On 07/18/2012 12:51 PM, Michael Meeks wrote: origin/feature/calc-multiline-input This was for last year's GSOC, and it's already (manually) merged back to the mainline. I will delete it soon (or you can, either way is fine with me). origin/feature/gsoc-calc-perf ori

Re: git branch audit ...

2012-07-18 Thread David Tardon
Hi, On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: > Hi guys, > > As I created a new git branch for some new work, I was interested to > see a rather huge list of malingering branches out there. Even after a: > > git remote prune origin > > I get quite a lot of

git branch audit ...

2012-07-18 Thread Michael Meeks
Hi guys, As I created a new git branch for some new work, I was interested to see a rather huge list of malingering branches out there. Even after a: git remote prune origin I get quite a lot of fluff that seems obsolete. I'd like to remove some of these branches if they'