← Back to branch summary

~mnordhoff/loggerhead/cheezum

~mnordhoff/loggerhead/cheezum

Viewing all changes in revision 480.

Committer: Matt Nordhoff
Date: 2010-05-15 05:28:55 UTC
mfrom: (164.129.36 statictuples_and_jam_integration)
Revision ID: mnordhoff@mattnordhoff.com-20100515052855-es124oa60t34hytd

Merge lp:~mnordhoff/loggerhead/statictuples_and_jam_integration, fixing conflicts.

files added:
loggerhead/history_db.py

loggerhead/history_db_schema.py

loggerhead/tests/test_importer.py

files removed:
loggerhead/wholehistory.py

files modified:
loggerhead/apps/branch.py

loggerhead/apps/transport.py

loggerhead/changecache.py

loggerhead/history.py

loggerhead/tests/__init__.py

loggerhead/tests/test_simple.py

serve-branches

Show diffs side-by-side

added added

removed removed

loggerhead/apps/branch.py

loggerhead/apps/transport.py

loggerhead/changecache.py

loggerhead/history.py

loggerhead/history_db.py

loggerhead/history_db_schema.py

loggerhead/tests/__init__.py

loggerhead/tests/test_importer.py

loggerhead/tests/test_simple.py

loggerhead/wholehistory.py

Older »