Re: [git wiki PATCH] Teaching "--3way" to "git apply"

From: Jeff King <peff@peff.net>
Date: Mar 5, 2012, 10:02 UTC
Message-ID: <20120305100236.GA29061@sigill.intra.peff.net>
In-Reply-To: <87vcmjxyjh.fsf@thomas.inf.ethz.ch>

On Mon, Mar 05, 2012 at 09:05:54AM +0100, Thomas Rast wrote:

Show 14 quoted lines

> > I actually think it may be a little bit too small for a whole summer
> > project. But I pushed it to the wiki for the reasons above; this is just
> > an ideas page, not a solid list of proposals.
> 
> Perhaps we should spell this out in the leading text?  I was going to
> send a patch, but got stuck rewording at
> 
>   Note that these are ideas, not project proposals.  As stated, they may
>   not be of the right difficulty or size to be solved within one Summer
>   of Code.
> 
> Maybe you can find a nicer way to write the "as stated" (I want it to
> say "in the form they currently have") and put that before the first
> title.

I think the whole intro text is pretty bad. I just pushed the patch below, but I'm open to suggestions.

-- >8 -- ideas: give a better introduction

The original text was just pulled from the ideas page of previous years. Let's rework it to address our two audiences (people adding ideas, and students reading the page) directly. And especially let's encourage students to realize that these ideas are just starting points, and try to get them to engage the community before writing a proposal (or worse, just submitting a proposal that is simply a cut-and-paste of one of the ideas).

Signed-off-by: Jeff King <peff@peff.net>
---
 SoC-2012-Ideas.md |   25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/SoC-2012-Ideas.md b/SoC-2012-Ideas.md
index aeaacb1..0bd938a 100644
--- a/SoC-2012-Ideas.md
+++ b/SoC-2012-Ideas.md
@@ -1,9 +1,24 @@
 This page contains project ideas for Google Summer of Code 2012 from the
-Git user and development community. You can get started by reading some
-project descriptions, and the mailing list thread(s) that spawned them.
-If you have another idea, add it to this page and start a discussion on
-the [[git mailing
-list|https://git.wiki.kernel.org/articles/g/i/t/GitCommunity_c4e3.html#Mailing_List]].
+Git user and development community.
+
+If you're active in the git community and have an idea that you would
+feel comfortable mentoring, feel free to add it. If you have an idea but
+need to find a suitable mentor, please bring it up on the [git mailing
+list]; others can help you develop the idea and may volunteer to mentor.
+
+If you're a prospective GSoC student, read through the ideas and see if
+any interest you. But note that these are ideas, not project proposals;
+they may need details filled in or expanded to make a good project.
+Find an area that interests you and start a discussion on the [git
+mailing list], even if it's just by asking more about the topic. A good
+proposal will be clear about the problem to be solved, the history of
+work in that area, and the specifics of the approach that the GSoC
+project will take. You can find some of those answers by reading the
+code and searching the list archives, but discussing the idea with
+interested developers is a great way for both the student and mentor to
+reach an understanding of exactly what is to be accomplished.
+
+[git mailing list]: https://git.wiki.kernel.org/articles/g/i/t/GitCommunity_c4e3.html#Mailing_List
 
 Better git log --follow support
 -------------------------------

-- 
1.7.9.1.11.g9d81f