Embrace master, wip_experiment branch is gone!

[Mirco Dotta]

Hey folks,

Just wanted to let you know that `wip_experiment` branch is gone, I just deleted it. 

Starting now the following workflow should be used when working on the plugin

http://www.assembla.com/spaces/scala-ide/wiki/Branches

Iulian has done some really nice job on the website's download page (http://download.scala-ide.org/)  

and he set up nighties for 2.1 (master branch)! This means that after your new feature has been reviewed 

and pushed into 2.1, then everyone will be immediately able to use it. 

Guys, I can't literally wait for using the IDE with semantic highlighting and show-implicits! 

Awesome times ahead!

-- Mirco

P.S. Work for the plugin 2.0 release is now done on the /release/scala-ide-2.0.x branch

---------------

Mirco Dotta

Typesafe - Enterprise-Grade Scala from the Experts 

PSE-D, 1015 Lausanne, Switzerland

Work: +41 (0)21 691 49 65

Twitter: @mircodotta

[Mirko Stocker]

On Friday 30 September 2011 10:49:32 Mirco Dotta wrote:
> Just wanted to let you know that `wip_experiment` branch is gone, I just
> deleted it.

For everybody wondering why he still sees a remotes/origin/wip_experiment
after pulling, do a

git remote prune origin

to clean up your repository :-)

Cheers,

Mirko

--
Mirko Stocker | m...@misto.ch
Work: http://ifs.hsr.ch | http://infoq.com
Personal: http://misto.ch | http://twitter.com/m_st

[Matthew Farwell]

Hooray!

 

Bien joué Mirco & Iulian.

Matthew.

[Mirco Dotta]

Thx Mirko for adding this info.

I'd also like to remind everyone to rename the branches you own so that they are in synch 

with the new convention

http://www.assembla.com/spaces/scala-ide/wiki/Branches

Specifically, Daniel, David, Hubert, Iulian, Matt , Matthew and Mirko, I see 

there are some branches where you seem to have done work (and I 

assume you own) and should be renamed/deleted if possible. 

If there are good reason why you can't delete them (multiple people working on them),

it's fine, but try to coordinate with committers so that you can find a moment for 

renaming the branches without creating issue.

Thanks everybody for helping out!

Cheers,

  Mirco

[Mirko Stocker]

On Friday 30 September 2011 11:12:49 Mirco Dotta wrote:
> Specifically, Daniel, David, Hubert, Iulian, Matt , Matthew and Mirko, I see
> there are some branches where you seem to have done work (and I
> assume you own) and should be renamed/deleted if possible.

I renamed my branches, so for what I care, all other branches can be deleted

[Mirco Dotta]

> I renamed my branches, so for what I care

Perfect!

> all other branches can be deleted

Can you do it yourself please. I just don't want to make some silly
mistake and delete someone else branch by mistake ;)

-- Mirco

[Matt Russell]

On Friday, September 30, 2011 10:12:49 AM UTC+1, Mirco Dotta wrote:

 

Specifically, Daniel, David, Hubert, Iulian, Matt , Matthew and Mirko, I see 

there are some branches where you seem to have done work (and I 

assume you own) and should be renamed/deleted if possible.

Other than "issues/semantic-highlighting-1000591", there shouldn't be any other branches I'm maintaining.

-- Matt

[Mirco Dotta]

Hi Matt,

There is a `formatter-demo` branch that you seem to have done work on. But I might be wrong...

[Matt Russell]

On 30 September 2011 11:46, Mirco Dotta <mirco...@typesafe.com> wrote:

> There is a `formatter-demo` branch that you seem to have done work on. But I
> might be wrong...

Hmm, I thought I'd deleted that a few days ago, and it's not currently
listed on the Assembla web interface....have you done a:

git fetch --prune

-- Matt

[Mirko Stocker]

On Friday 30 September 2011 12:31:33 Mirco Dotta wrote:
> Can you do it yourself please. I just don't want to make some silly
> mistake and delete someone else branch by mistake

Me neither.. I removed/renamed everything I own. Is there a way to see who
directly (i.e. excluding merges) committed to a branch?

-- Mirko

[Mirco Dotta]

Mirko, Matt, my bad. Sorry.

Thanks for being so effective :)

-- Mirco

[Matthew Farwell]

Salut,

There aren't any branches that I'm currently involved in. Do you mean gsoc & helios? For me, you can delete these, because all I did was to merge stuff from wip_experiment into these branches. Both of these branches are now in master as far as I'm aware. I can delete these if you like, but I didn't create them.

Cordialement,

Matthew.

[Mirco Dotta]

Hey Matthew,

> There aren't any branches that I'm currently involved in. Do you mean gsoc & helios? For me, you can delete these, because all I did was to merge stuff from wip_experiment into these branches. Both of these branches are now in master as far as I'm aware. I can delete these if you like, but I didn't create them.

I see. Then let's let them around for the moment, I'd prefer that the owner of the branch actually does the deletion.

Maybe Miles and/or David know more about these branches.

-- Mirco

[Miles Sabin]

On Fri, Sep 30, 2011 at 9:49 AM, Mirco Dotta <mirco...@typesafe.com> wrote:
> Just wanted to let you know that `wip_experiment` branch is gone, I just
> deleted it.
> Starting now the following workflow should be used when working on the
> plugin
> http://www.assembla.com/spaces/scala-ide/wiki/Branches
> Iulian has done some really nice job on the website's download
> page (http://download.scala-ide.org/)
> and he set up nighties for 2.1 (master branch)! This means that after your
> new feature has been reviewed
> and pushed into 2.1, then everyone will be immediately able to use it.
> Guys, I can't literally wait for using the IDE with semantic highlighting
> and show-implicits!
> Awesome times ahead!
> -- Mirco
> P.S. Work for the plugin 2.0 release is now done on the
> /release/scala-ide-2.0.x branch

Good work! :-)

Cheers,

Miles

--
Miles Sabin
tel: +44 7813 944 528
gtalk: mi...@milessabin.com
skype: milessabin
http://www.chuusai.com/
http://twitter.com/milessabin

[David Bernard]

hi,

I'll take care of the following branch when back to home (later tonight), actions :

To delete (branches I own):

* wip_tuning 

* wip_usage_tracker

To delete (branches I don't own but I know to be deprecated, content was merge into wip_exp_backport) :

* gsoc

* helios

* wip_stabilize

To rename:

* milestone => release/scala-ide-1.x

* wip_exp_backport => experimental/scala-ide-1.x

/davidB

[Mirco Dotta]

Awesome. Thanks a lot for taking care of that David, really appreciate it!

-- Mirco

[David Bernard]

Done