[yt-dev] Backporting bugfixes for yt 3.3.2

Nathan Goldbaum nathan12343 at gmail.com
Tue Sep 13 13:18:13 PDT 2016


I spent a little more time with it today and I was able to figure out a way
to do this without using rebases that let me avoid the conflicts.

On Tue, Sep 13, 2016 at 4:01 AM, Britton Smith <brittonsmith at gmail.com>
wrote:

> HI Nathan,
>
> I'm sorry, I'm not going to have time to do this for at least a week.  It
> may just have to stay out until the next bugfix release or the next major
> release when we can just merge dev into stable.
>
> Britton
>
> On Mon, Sep 12, 2016 at 11:20 PM, Nathan Goldbaum <nathan12343 at gmail.com>
> wrote:
>
>> Hi Britton,
>>
>> Given the large number of merge commits in PR 2345 (which I need to
>> manually cut and paste around since they can't be rebased) and given that
>> PR 2344 was also backported and changed the same files, I'm unfortunately
>> not able to backport PR 2345 cleanly. I tried to resolve the merge
>> conflicts, but I don't have enough context on this code to do that with any
>> confidence.
>>
>> Is there any chance you can manually backport it for me on top of my pull
>> request to the stable branch? I'm happy to hop onto a hangout of a
>> messaging session to walk you through the mercurial commands, if you need
>> it.
>>
>> Here's my PR: https://bitbucket.org/yt_analysis/yt/pull-requests/2375
>>
>> Thanks!
>>
>> -Nathan
>>
>>
>>
>> On Fri, Sep 2, 2016 at 10:34 AM, Cameron Hummels <chummels at gmail.com>
>> wrote:
>>
>>> Hey Nathan,
>>>
>>> Thanks for taking care of all of the back porting. I request that the
>>> PRs to LightRay and AbsorptionSpectrum be included in 3.3.2 if possible.
>>> There have been a number that have come out since 3.3.1 that have
>>> stabilized behavior. I'm trying to get one more out this weekend but more
>>> in that soon. Thank you!
>>>
>>> Cameron
>>>
>>>
>>>
>>> > On Sep 1, 2016, at 9:39 AM, Nathan Goldbaum <nathan12343 at gmail.com>
>>> wrote:
>>> >
>>> > Hi all,
>>> >
>>> > Today I'm going to spend some time backporting bugfixes to the stable
>>> branch so we can cut yt 3.3.2. I expect it will be merged in next week at
>>> the PR review hangout (which I will send out an invite for this weekend).
>>> >
>>> > Please let me know if there are any bugfixes you'd particularly like
>>> this release to include or if you'd like me to wait on something you have
>>> in the works.
>>> >
>>> > -Nathan
>>> > _______________________________________________
>>> > yt-dev mailing list
>>> > yt-dev at lists.spacepope.org
>>> > http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org
>>> _______________________________________________
>>> yt-dev mailing list
>>> yt-dev at lists.spacepope.org
>>> http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org
>>>
>>
>>
>> _______________________________________________
>> yt-dev mailing list
>> yt-dev at lists.spacepope.org
>> http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org
>>
>>
>
> _______________________________________________
> yt-dev mailing list
> yt-dev at lists.spacepope.org
> http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-dev-spacepope.org/attachments/20160913/35bca95d/attachment.html>


More information about the yt-dev mailing list