/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/textinv.py

  • Committer: John Arbash Meinel
  • Date: 2009-08-18 21:41:08 UTC
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090818214108-03e6hkoj7v4va7x8
Turns out that some code assumed passing NULL_REVISION to merge_sort
always was fine, and now that we are using 'keys' it was passing (NULL_REVISION,)
for now, that should be ok.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textinv.py
16
16
 
17
17
 
18
18
from bzrlib.errors import BzrError
19
 
from bzrlib.inventory import Inventory
 
19
from bzrlib.inventory import InventoryEntry, Inventory
20
20
 
21
21
 
22
22
START_MARK = "# bzr inventory format 3\n"