Spring cleanup of the scala-ide repository - Scala IDE Dev

The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Message from discussion Spring cleanup of the scala-ide repository
Received-SPF: pass (google.com: domain of mirco.do...@typesafe.com designates 74.125.83.51 as permitted sender) client-ip=74.125.83.51;
From: Mirco Dotta <mirco.do...@typesafe.com>
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: multipart/alternative; boundary=Apple-Mail-83--473417956
Subject: Re: [scala-ide-dev] Spring cleanup of the scala-ide repository
Date: Tue, 8 May 2012 09:52:31 +0200
In-Reply-To: <CAN4BhaKZgv5wM2QqkdHbwN_AQsu=TaeXgvBUq4iLLH4Vofv...@mail.gmail.com>
To: scala-ide-dev@googlegroups.com
References: <CAOwe9fbXzMOgNMJmcdnzyc9qQY42QtbzR9w3i4=0hfYsNwR...@mail.gmail.com> <CAN4BhaKZgv5wM2QqkdHbwN_AQsu=TaeXgvBUq4iLLH4Vofv...@mail.gmail.com>
Message-Id: <E1CC3B9A-568B-4D08-9D92-4A14C1E0A...@typesafe.com>


--Apple-Mail-83--473417956
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii


On May 7, 2012, at 7:25 PM, Mirko Stocker wrote:

> Hi,
>=20
>> There is one small downside: developing
>> everything in branches leads to a lot of unnecessary/old/dead =
branches that
>> need to be removed after a successful merge. Most of us forget to do =
that.
>=20
> While thinking about this, I found some useful commands for this kind =
of work:
>=20
> git branch -r --merged
>=20
> When run from master, all these branches could be deleted because
> they've been merged into master:
>=20
>  origin/feature/allow-sbt-to-change-the-order-of-compilation-1000664
>  origin/feature/find-references-1000698
>  origin/feature/surround-selection-1001010
>  origin/feature/tuning-semantic-highlighting
>  origin/issue/hyperlink-to-implicit-1001002
>  origin/issue/iindex-value-for-arrays-1001009
>  origin/issue/jdk-1000406-again
>  origin/issue/multiple-errors-1000735
>  origin/issue/open-declaration-fails-from-popup-menu-1000920
>  origin/issue/overlong-problem-markers-1000671
>  origin/issue/show-only-accessible-members-1000784
>  origin/issue/show-type-of-selection-1000954
>  origin/issue/todo-1000634
>  origin/issues/equinox-hook-1000918
>=20
> --no-merged shows the un-merged branches, but again, from the
> perspective of the current branch.

Really useful commands, thanks!

>> Everyone, including committers, would issue pull-requests from their =
own
>> forks. Given the distributed nature of Git, and the great support in =
Github,
>> I don't foresee any problems or extra work.
>>=20
>> Thoughts?
>=20
> I see just one risk, it's easier to miss an unmerged branch if it is
> in a different repository.

This risk is existing also right now, none of us is actually looking at =
what has=20
been merged vs not-yet-merged. Hopefully, working on a fork will push =
people=20
to integrate changes back asap.

> And, doesn't it make working together on a
> feature more complicated? If I have to fork the fork and then send
> pull requests for the fork.. seems messy.

As Luc said, no need to fork the fork, just add the upstream (the person =
with whom you=20
are collaborating has to give you write access to the repo, of course)

	http://help.github.com/fork-a-repo/

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


---------------
Mirco Dotta
Typesafe - The software stack for applications that scale
PSE-D, 1015 Lausanne, Switzerland
Work: +41 (0)21 691 49 65
Twitter: @mircodotta









--Apple-Mail-83--473417956
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html;
	charset=us-ascii

<html><head></head><body style=3D"word-wrap: break-word; =
-webkit-nbsp-mode: space; -webkit-line-break: after-white-space; =
"><br><div><div>On May 7, 2012, at 7:25 PM, Mirko Stocker =
wrote:</div><br class=3D"Apple-interchange-newline"><blockquote =
type=3D"cite"><div>Hi,<br><br><blockquote type=3D"cite">There is one =
small downside: developing<br></blockquote><blockquote =
type=3D"cite">everything in branches leads to a lot of =
unnecessary/old/dead branches that<br></blockquote><blockquote =
type=3D"cite">need to be removed after a successful merge. Most of us =
forget to do that.<br></blockquote><br>While thinking about this, I =
found some useful commands for this kind of work:<br><br>git branch -r =
--merged<br><br>When run from master, all these branches could be =
deleted because<br>they've been merged into master:<br><br> =
&nbsp;origin/feature/allow-sbt-to-change-the-order-of-compilation-1000664<=
br> &nbsp;origin/feature/find-references-1000698<br> =
&nbsp;origin/feature/surround-selection-1001010<br> =
&nbsp;origin/feature/tuning-semantic-highlighting<br> =
&nbsp;origin/issue/hyperlink-to-implicit-1001002<br> =
&nbsp;origin/issue/iindex-value-for-arrays-1001009<br> =
&nbsp;origin/issue/jdk-1000406-again<br> =
&nbsp;origin/issue/multiple-errors-1000735<br> =
&nbsp;origin/issue/open-declaration-fails-from-popup-menu-1000920<br> =
&nbsp;origin/issue/overlong-problem-markers-1000671<br> =
&nbsp;origin/issue/show-only-accessible-members-1000784<br> =
&nbsp;origin/issue/show-type-of-selection-1000954<br> =
&nbsp;origin/issue/todo-1000634<br> =
&nbsp;origin/issues/equinox-hook-1000918<br><br>--no-merged shows the =
un-merged branches, but again, from the<br>perspective of the current =
branch.<br></div></blockquote><div><br></div><div>Really useful =
commands, thanks!</div><br><blockquote type=3D"cite"><div><blockquote =
type=3D"cite">Everyone, including committers, would issue pull-requests =
from their own<br></blockquote><blockquote type=3D"cite">forks. Given =
the distributed nature of Git, and the great support in =
Github,<br></blockquote><blockquote type=3D"cite">I don't foresee any =
problems or extra work.<br></blockquote><blockquote =
type=3D"cite"><br></blockquote><blockquote =
type=3D"cite">Thoughts?<br></blockquote><br>I see just one risk, it's =
easier to miss an unmerged branch if it is<br>in a different repository. =
</div></blockquote><div><br></div><div>This risk is existing also right =
now, none of us is actually looking at what has&nbsp;</div><div>been =
merged vs not-yet-merged.&nbsp;Hopefully, working on a fork will push =
people&nbsp;</div><div>to integrate changes back =
asap.</div><br><blockquote type=3D"cite"><div>And, doesn't it make =
working together on a<br>feature more complicated? If I have to fork the =
fork and then send<br>pull requests for the fork.. seems =
messy.<br></div></blockquote><div><br></div><div>As Luc said,&nbsp;no =
need to fork the fork, just add the upstream (the person with whom =
you&nbsp;</div><div>are collaborating has to give you write access to =
the repo, of course)</div><div><br></div><div><span =
class=3D"Apple-tab-span" style=3D"white-space:pre">	<a =
href=3D"http://help.github.com/fork-a-repo/">http://help.github.com/fork-a=
-repo/</a></span></div><br><blockquote =
type=3D"cite"><div><br>Cheers,<br><br>Mirko<br><br>-- <br>Mirko Stocker =
| <a href=3D"mailto:m...@misto.ch">m...@misto.ch</a><br>Work: <a =
href=3D"http://ifs.hsr.ch">http://ifs.hsr.ch</a> | <a =
href=3D"http://infoq.com">http://infoq.com</a><br>Personal: <a =
href=3D"http://misto.ch">http://misto.ch</a> | <a =
href=3D"http://twitter.com/m_st">http://twitter.com/m_st</a><br></div></bl=
ockquote></div><br><div>
<span class=3D"Apple-style-span" style=3D"border-collapse: separate; =
color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; =
font-variant: normal; font-weight: normal; letter-spacing: normal; =
line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: =
0px; text-transform: none; white-space: normal; widows: 2; word-spacing: =
0px; -webkit-border-horizontal-spacing: 0px; =
-webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><span =
class=3D"Apple-style-span" style=3D"border-collapse: separate; color: =
rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: =
normal; font-weight: normal; letter-spacing: normal; line-height: =
normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: =
normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: =
0px; -webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><div =
style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; =
-webkit-line-break: after-white-space; "><span class=3D"Apple-style-span" =
style=3D"border-collapse: separate; color: rgb(0, 0, 0); font-family: =
Helvetica; font-style: normal; font-variant: normal; font-weight: =
normal; letter-spacing: normal; line-height: normal; orphans: 2; =
text-indent: 0px; text-transform: none; white-space: normal; widows: 2; =
word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; =
-webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><div =
style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; =
-webkit-line-break: after-white-space; "><span class=3D"Apple-style-span" =
style=3D"border-collapse: separate; color: rgb(0, 0, 0); font-family: =
Helvetica; font-style: normal; font-variant: normal; font-weight: =
normal; letter-spacing: normal; line-height: normal; orphans: 2; =
text-indent: 0px; text-transform: none; white-space: normal; widows: 2; =
word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; =
-webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><span =
class=3D"Apple-style-span" style=3D"border-collapse: separate; color: =
rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: =
normal; font-weight: normal; letter-spacing: normal; line-height: =
normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: =
normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: =
0px; -webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><div =
style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; =
-webkit-line-break: after-white-space; "><span class=3D"Apple-style-span" =
style=3D"border-collapse: separate; color: rgb(0, 0, 0); font-family: =
Helvetica; font-style: normal; font-variant: normal; font-weight: =
normal; letter-spacing: normal; line-height: normal; orphans: 2; =
text-indent: 0px; text-transform: none; white-space: normal; widows: 2; =
word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; =
-webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><div =
style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; =
-webkit-line-break: after-white-space; "><span class=3D"Apple-style-span" =
style=3D"border-collapse: separate; color: rgb(0, 0, 0); font-family: =
Helvetica; font-style: normal; font-variant: normal; font-weight: =
normal; letter-spacing: normal; line-height: normal; orphans: 2; =
text-indent: 0px; text-transform: none; white-space: normal; widows: 2; =
word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; =
-webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><div =
style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; =
-webkit-line-break: after-white-space; "><span class=3D"Apple-style-span" =
style=3D"border-collapse: separate; color: rgb(0, 0, 0); font-family: =
Helvetica; font-style: normal; font-variant: normal; font-weight: =
normal; letter-spacing: normal; line-height: normal; orphans: 2; =
text-indent: 0px; text-transform: none; white-space: normal; widows: 2; =
word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; =
-webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><div =
style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; =
-webkit-line-break: after-white-space; "><span class=3D"Apple-style-span" =
style=3D"border-collapse: separate; color: rgb(0, 0, 0); font-family: =
Helvetica; font-style: normal; font-variant: normal; font-weight: =
normal; letter-spacing: normal; line-height: normal; orphans: 2; =
text-indent: 0px; text-transform: none; white-space: normal; widows: 2; =
word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; =
-webkit-border-vertical-spacing: 0px; =
-webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: =
auto; -webkit-text-stroke-width: 0px; font-size: medium; "><div =
style=3D"word-wrap: break-word; -webkit-nbsp-mode: space; =
-webkit-line-break: after-white-space; "><div><br =
class=3D"Apple-interchange-newline">---------------</div><div>Mirco =
Dotta<div><a href=3D"http://www.typesafe.com/" =
target=3D"_blank">Typesafe</a>&nbsp;-&nbsp;The software stack for =
applications that scale</div><div>PSE-D, 1015 Lausanne, =
Switzerland<br></div><div>Work: +41 (0)21 691 49 65</div>Twitter: =
@mircodotta</div><div><br></div></div></span><br =
class=3D"Apple-interchange-newline"></div></span><br =
class=3D"Apple-interchange-newline"></div></span><br =
class=3D"Apple-interchange-newline"></div></span><br =
class=3D"Apple-interchange-newline"></div></span><br =
class=3D"Apple-interchange-newline"></span><br =
class=3D"Apple-interchange-newline"></div></span></div></span></span>
</div>
<br></body></html>=

--Apple-Mail-83--473417956--
Create a group - Google Groups - Google Home - Terms of Service - Privacy Policy
Account Options
