Pauli, Thanks a lot for doing this, it helps a lot. Ilan was on another project this morning so this helps get the merge process started faster. It looks like it is auto-merging changes from Travis's repository because several recent changes are moved over. I will double check, but we should be able to switch to using this repository now.
Thanks, Jason On Fri, Nov 12, 2010 at 3:31 PM, Pauli Virtanen <p...@iki.fi> wrote: > On Fri, 12 Nov 2010 14:37:19 -0600, Jason McCampbell wrote: > >> Sure: > >> > >> https://github.com/numpy/numpy-refactor > >> > >> I can re-sync/scrap it later on if needed, depending on what the > >> refactoring team wants to do with it. > > Ok, maybe to clarify: > > - That repo is already created, > > - It contains your refactoring work, grafted on the current Git history, > so you can either start merging using it, or first re-do the graft if > you want to do it yourselves, > > - You (and also the rest of the team) have push permissions there. > > Cheers, > Pauli > > > PS. > > You can verify that the contents of the trees are exactly what you had > before the grafting: > > $ git cat-file commit origin/refactor > tree 85170987b6d3582b7928d46eda98bdfb394e0ea7 > parent fec0175e306016d0eff688f63912ecd30946dcbb > parent 7383a3bbed494aa92be61faeac2054fb609a1ab1 > author Ilan Schnell <ischn...@enthought.com> 1289517493 -0600 > committer Ilan Schnell <ischn...@enthought.com> 1289517493 -0600 > ... > > $ git cat-file commit new-rebased > tree 85170987b6d3582b7928d46eda98bdfb394e0ea7 > parent 5e24bd3a9c2bdbd3bb5e92b03997831f15c22e4b > parent e7caa5d73912a04ade9b4a327f58788ab5d9d585 > author Ilan Schnell <ischn...@enthought.com> 1289517493 -0600 > committer Ilan Schnell <ischn...@enthought.com> 1289517493 -0600 > > The tree hashes coincide, which means that the state of the tree at the > two commits is exactly identical. > > _______________________________________________ > NumPy-Discussion mailing list > NumPy-Discussion@scipy.org > http://mail.scipy.org/mailman/listinfo/numpy-discussion >
_______________________________________________ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion
