Merge #138 not showing up in master?

[Clint]

I've been having the same error described in issue #138: https://github.com/kivy/pyjnius/pull/138

It looks like a fix was submitted and @tito merged it into master: https://github.com/kivy/pyjnius/pull/138/commits

However, I don't actually see the changes in the current version of the file: https://github.com/kivy/pyjnius/blob/master/jnius/reflect.py

Any ideas as to why the merge isn't actually in master? Perhaps I'm missing something...

Thanks!

[Mathieu Virbel]

I looked twice, i see the changes in the current version :)

—
Sent from Mailbox

--
You received this message because you are subscribed to the Google Groups "PyJNIus development ML" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pyjnius-dev...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Rémi Rampin]

2015-03-13 5:36 EDT, Mathieu Virbel <txp...@gmail.com>:

I looked twice, i see the changes in the current version :)

Sorry to intrude, but the changes are definitely not in there.

See the changelog for jnius/reflect.py; hasn't changed since Jun 2013.

If you look at the file, the semicolons are still there.

git branch gives me:

$ git branch -r --contains f0b8ce3856c87730e1eccdd1091205ff85423ca1

error: no such commit f0b8ce3856c87730e1eccdd1091205ff85423ca1

I opened a new pull request: #152.

-- 

Rémi "Remram" Rampin

[Gabriel Pettier]

You are looking at master branch of tonyfinn's fork, who did his fixes
in his patch-1 branch (generated by github), so it's not in his master,
on the other hand, since this PR merged this branch in our master, you
can see it's there now…

://github.com/kivy/pyjnius/commits/master/jnius/reflect.py

On Fri, Mar 13, 2015 at 10:10:29AM -0400, Rémi Rampin wrote:
> 2015-03-13 5:36 EDT, Mathieu Virbel <txp...@gmail.com>:
>
> > I looked twice, i see the changes in the current version :)
> >
>
> Sorry to intrude, but the changes are definitely not in there.
>
> See the changelog for jnius/reflect.py

> <https://github.com/tonyfinn/pyjnius/commits/master/jnius/reflect.py>;

> hasn't changed since Jun 2013.
> If you look at the file

> <https://github.com/tonyfinn/pyjnius/blob/master/jnius/reflect.py>, the

> semicolons are still there.
> git branch gives me:
>
> $ git branch -r --contains f0b8ce3856c87730e1eccdd1091205ff85423ca1
> error: no such commit f0b8ce3856c87730e1eccdd1091205ff85423ca1
>
>

> I opened a new pull request: #152 <https://github.com/kivy/pyjnius/pull/152>
> .
>
> --
> Rémi "Remram" Rampin

[Rémi Rampin]

2015-03-13 10:29 EST, Gabriel Pettier <gabriel...@gmail.com>:

You are looking at master branch of tonyfinn's fork, who did his fixes
in his patch-1 branch (generated by github), so it's not in his master,
on the other hand, since this PR merged this branch in our master, you
can see it's there now…

Yes, the links were wrong, but you'd have seen the same by changing "tonyfinn" to "kivy". You can see it now because of #152.

I did a pass over your merged PRs, #144 is also missing, I filed again as #153.