← Back to branch summary

~mnordhoff/loggerhead/jam-integration

~mnordhoff/loggerhead/jam-integration

Viewing all changes in revision 422.

Committer: Matt Nordhoff
Date: 2010-05-15 05:16:10 UTC
mfrom: (411.6.22 history_db)
Revision ID: mnordhoff@mattnordhoff.com-20100515051610-reaj8o8z66lwl9us

Merge the latest history-db, fixing conflicts.

files added:
loggerhead/history_db.py

loggerhead/history_db_schema.py

loggerhead/tests/test_importer.py

files removed:
docs/start-loggerhead.rst

docs/stop-loggerhead.rst

loggerhead/trace.py

loggerhead/wholehistory.py

start-loggerhead

start-loggerhead.1

stop-loggerhead

stop-loggerhead.1

files modified:
NEWS

__init__.py

docs/index.rst

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/apps/transport.py

loggerhead/changecache.py

loggerhead/config.py

loggerhead/controllers/download_ui.py

loggerhead/history.py

loggerhead/main.py

loggerhead/templates/atom.pt

loggerhead/tests/__init__.py

loggerhead/tests/test_simple.py

loggerhead/zptsupport.py

serve-branches

setup.py

Show diffs side-by-side

added added

removed removed

docs/start-loggerhead.rst

docs/stop-loggerhead.rst

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/apps/transport.py

loggerhead/changecache.py

loggerhead/config.py

loggerhead/controllers/download_ui.py

loggerhead/history.py

loggerhead/history_db.py

loggerhead/history_db_schema.py

loggerhead/main.py

loggerhead/templates/atom.pt

loggerhead/tests/__init__.py

loggerhead/tests/test_importer.py

loggerhead/tests/test_simple.py

loggerhead/trace.py

loggerhead/wholehistory.py

loggerhead/zptsupport.py

start-loggerhead

start-loggerhead.1

stop-loggerhead

stop-loggerhead.1

Older »