[IPython-dev] Helping battle testing the newapp branch
Mon Jun 20 16:15:10 CDT 2011
On Mon, Jun 20, 2011 at 14:00, Thomas Kluyver <firstname.lastname@example.org> wrote:
> On 20 June 2011 19:10, MinRK <email@example.com> wrote:
>> I think we should merge newapp into master. It is a big change, and
>> needs to spend some time there before release, and that time is
>> quickly running out. We should be releasing 0.11 in less than 2
>> It also makes other pull requests hard, because it touches so much of
>> the code base.
> I'll second this - we're not going to reject it, the diff is too big to
> really get a handle on, and various other pull requests will need to be
> rebased once it's merged, so we may as well get on with it.
> The only thing I would suggest is: can we tag* the commit immediately before
> we merge, so that we've got a reference point if we think there are
> *I'm guessing this is how git tags work - if not, substitute the appropriate
Tags are typically a permanent, lasting reference point, though I
suppose we could have a transient tag pointing to pre-newapp HEAD.
Alternatively, we could ensure that newapp gets a proper merge, which
would make the previous head obvious (merge commits have two parents),
but that's not quite as convenient for easy checkout as a proper tag.
More information about the IPython-dev