tox

http://testrun.org/tox/latest/
generic virtualenv management and test command line tool.

used by coverage.py, looks pretty interesting for testing against multiple versions and environments.

scm-latexdiff

http://www.numbertheory.nl/2012/02/09/scm-latexdiff-a-python-script-to-calculate-diffs-for-tex-files-in-git-or-mercurial-repositories/

works for git and hg repositories.

inspect-shell

https://github.com/amoffat/Inspect-Shell

looks like a pretty cool way to open a manhole into a running python script. it is not a debugger and it doesn't lock or interrupt. allows you to call functions, inspect or (dangerously) modify globals, etc.

gitflow

http://nvie.com/posts/a-successful-git-branching-model/
procedure for working with a sane graph of git branches, from Vincent Driessen

more info and tools from
https://github.com/nvie/gitflow

gource

http://code.google.com/p/gource/

version control visualization. makes really cool movies showing the people making revisions over time.

windows python path bug

had a weird bug trying to import numpy:
...
from numpy.linalg import lapack_lite
ImportError: DLL load failed: The specified module could not be found.

looks like it's actually because the python Scripts dir needs to be in the path
http://bugs.activestate.com/show_bug.cgi?id=89474

export PATH=$PATH:/cygdrive/c/Python27/Scripts/
made it work.

git - merging a merge from a clone

still trying to figure git out.... i had a clone in which i had forked off a previous commit and made some changes, then did a merge to bring both branches together. now i need to bring that merged update (along with the intermediate forked-off commit, if possible) to the origin. 'git fetch file:///remote' didn't seem to do anything, and even after 'git merge' i didn't see those other commits in my original repo.

finally, the thing that seemed to do the trick was 'git merge FETCH_HEAD'. so i guess git fetch grabbed the info, but it just didn't make it visible. the clue was the return from 'git fetch':
* branch HEAD -> FETCH_HEAD

now my repos match.