[IPython-dev] Pull request workflow...

[Darren Dale]

On Sun, Oct 10, 2010 at 9:23 PM, Fernando Perez <fperez.net at gmail.com> wrote:
> Hi Darren,
>
> I'm bouncing back this reply to the list, because this is a good
> question that deserves clarification.  I'm hoping in the end, this
> conversation will be summarized in our guidelines, so I'd rather have
> it all publicly archived.

Thats fine. I sent it offlist because I didn't want to risk muddying
the waters unnecessarily.

> The approach I propose depends on one idea and assumption: that the
> branches aren't terribly long-lived, and that there isn't a
> complicated hierarchy of branches-from-branches.  It encourages the
> development of small, self-contained feature branches.
>
> Note that the above doesn't preclude anyone from benefiting from a
> given feature branch and the history in trunk: they can use their
> master, or any other integration branch, where they track trunk and
> merge the feature *into*.  This branch will be their personal way of
> tracking trunk and using their feature (or features, this can be done
> with multiple branches) until the feature is merged upstream.  In fact
> I have done this multiple times already, and it works fine.
>
> Does this sound reasonable?  I'm no git expert though, so it's quite
> possible there are still cases I haven't considered or where the above
> is insufficient.  We'll have to find the patterns that fit them as we
> encounter them.

It does. Do we assume that the only branches that are safe to track
are the ones published at the ipython page at github?

Darren