[IPython-dev] Merging nbconvert **now**

Brian Granger ellisonbg@gmail....
Sun Jun 30 22:51:55 CDT 2013


I see how you did it.

On Sun, Jun 30, 2013 at 8:46 PM, Brian Granger <ellisonbg@gmail.com> wrote:
> Hmm, I will look at it - but how does this command sequence know to
> put nbconvert/nbconvert as ipython/IPython/nbconvert and leave out the
> rest of the nbconvert repo?
>
> Brian
>
> On Sun, Jun 30, 2013 at 8:32 PM, MinRK <benjaminrk@gmail.com> wrote:
>> I didn't use git sub-tree, I just did:
>>
>> git remote add nbconvert ipython/nbconvert
>> git fetch nbconvert
>> git merge nbconvert/master
>>
>> and resolved the few tiny conflicts on README, .gitignore, etc.
>>
>>
>>
>> On Sun, Jun 30, 2013 at 6:27 PM, Fernando Perez <fperez.net@gmail.com>
>> wrote:
>>>
>>> for reference, the correct PR that preserves history is here:
>>>
>>> https://github.com/ipython/ipython/pull/3500
>>>
>>> We'd always said we'd fully preserve the history of the nbconvert
>>> effort to properly credit all its authors.
>>>
>>> I don't know if Min ended up using the git subtree merging approach
>>> (http://git-scm.com/book/ch6-7.html), but it seems that #3500 has all
>>> the proper history.
>>>
>>> We can continue the discussion there...
>>>
>>> Cheers,
>>>
>>> f
>>>
>>> On Sun, Jun 30, 2013 at 3:46 PM, Brian Granger <ellisonbg@gmail.com>
>>> wrote:
>>> > Here is the PR:
>>> >
>>> > https://github.com/ipython/ipython/pull/3497
>>> >
>>> > On Sun, Jun 30, 2013 at 2:27 PM, Jonathan Frederic
>>> > <jdfreder@calpoly.edu> wrote:
>>> >> Sounds good to me.
>>> >>
>>> >> Jon
>>> >>
>>> >> On 6/30/2013 1:34 PM, Brian Granger wrote:
>>> >>> The merge would be by hand and only include the nbconvert package and
>>> >>> top level script.  nbconvert1 is not coming along...
>>> >>>
>>> >>> Brian
>>> >>>
>>> >>> On Sun, Jun 30, 2013 at 1:23 PM, Matthias BUSSONNIER
>>> >>> <bussonniermatthias@gmail.com> wrote:
>>> >>>> Le 30 juin 2013 à 21:28, Brian Granger a écrit :
>>> >>>>
>>> >>>>> Hi,
>>> >>>>>
>>> >>>>> What do others think?
>>> >>>> I think that would be great to merge, at least the module, if not the
>>> >>>> entry point yet.
>>> >>>> I'm really over-booked theses day, I'll do my best to review, but it
>>> >>>> will be really hard.
>>> >>>>
>>> >>>> Don't know how you intend to make the merge, but dropping
>>> >>>> nbconvert1(and other
>>> >>>> useless stuff like python-armor that was an example) might be great
>>> >>>> to do before merging.
>>> >>>> --
>>> >>>> Matthias
>>> >>>>
>>> >>>> _______________________________________________
>>> >>>> IPython-dev mailing list
>>> >>>> IPython-dev@scipy.org
>>> >>>> http://mail.scipy.org/mailman/listinfo/ipython-dev
>>> >>>
>>> >>>
>>> >>
>>> >> _______________________________________________
>>> >> IPython-dev mailing list
>>> >> IPython-dev@scipy.org
>>> >> http://mail.scipy.org/mailman/listinfo/ipython-dev
>>> >
>>> >
>>> >
>>> > --
>>> > Brian E. Granger
>>> > Cal Poly State University, San Luis Obispo
>>> > bgranger@calpoly.edu and ellisonbg@gmail.com
>>> > _______________________________________________
>>> > IPython-dev mailing list
>>> > IPython-dev@scipy.org
>>> > http://mail.scipy.org/mailman/listinfo/ipython-dev
>>>
>>>
>>>
>>> --
>>> Fernando Perez (@fperez_org; http://fperez.org)
>>> fperez.net-at-gmail: mailing lists only (I ignore this when swamped!)
>>> fernando.perez-at-berkeley: contact me here for any direct mail
>>> _______________________________________________
>>> IPython-dev mailing list
>>> IPython-dev@scipy.org
>>> http://mail.scipy.org/mailman/listinfo/ipython-dev
>>
>>
>>
>> _______________________________________________
>> IPython-dev mailing list
>> IPython-dev@scipy.org
>> http://mail.scipy.org/mailman/listinfo/ipython-dev
>>
>
>
>
> --
> Brian E. Granger
> Cal Poly State University, San Luis Obispo
> bgranger@calpoly.edu and ellisonbg@gmail.com



-- 
Brian E. Granger
Cal Poly State University, San Luis Obispo
bgranger@calpoly.edu and ellisonbg@gmail.com


More information about the IPython-dev mailing list