pypi version doesn't appear to match github version

[ryanfox]

Hello,

I've installed twine via pip install twine, and it doesn't appear to match the release tagged with the same version number on github. pip freeze tells me I have version 1.3.1. Pypi says this version was uploaded 4/20/14. Indeed, checking the commit log on github shows a version number bump on 4/20.

However, the two commits right before that one, (55028ae and a311454) don't appear to have made it into the version I have. Inspecting upload.py shows I don't have those lines, either the "before" or "after" code from the diff.

I'm not sure where the discrepancy is coming from, but it sure seems unusual. Any help would be appreciated.

[cjerdonek]

You're probably looking at the commit history for the master branch. If you look at the commit history for the tag, you'll see that those commits weren't included: https://github.com/pypa/twine/commits/1.3.1

When GitHub displays commits, it seems to display the commits in chronological order. So if one commit appears before another, it doesn't necessarily mean the prior commit is a parent of the other (there can be many different "ancestry lines" of commits).

Try this from the command-line to see all relationships across all branches:

$ git log --graph --oneline --branches

[ryanfox]

Of course you're right. Thanks!