It's only a few files.  The simplest thing would be to to create two
pull requests.  One for the c files and one for the unit test.

Does that make sense?


On Thu, Jun 6, 2013 at 1:42 PM, seberg <notifications@github.com> wrote:

> In numpy/core/tests/test_api.py:
>
> > @@ -96,6 +238,8 @@ def test_array_astype():
> >      b = a.astype('S')
> >      assert_equal(a, b)
> >      assert_equal(b.dtype, np.dtype('S100'))
> > +
> > +    from numpy.compat import sixu
>
> Yeah it is a bit of a mess now. One problem is that you are working on
> your master branch which is not very good, because then you can't merge the
> upstream master any more. First "git branch" this stuff (an extra backup
> would be good too probably). Then git reset b6e289d (after doing a
> backup), if you did commits after b6e289d<https://github.com/numpy/numpy/commit/b6e289d>you may need to git cherry-pick those.
> *Then* you can use git rebase -i 3005596, etc. Since you generally don't
> want to work on the master branch, you may want to close this pull request,
> push the new branch and then create a new pull request based on that
> branch. I have to go, maybe this gives you enough ideas on how to fix
> things up though...
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/numpy/numpy/pull/3396/files#r4573072>
> .
>