/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/repository.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-17 00:34:28 UTC
  • mfrom: (4754 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4755.
  • Revision ID: john@arbash-meinel.com-20091017003428-opg71qwkbzr3clko
Merge bzr.dev resolve test conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4319
4319
                ):
4320
4320
                if versioned_file is None:
4321
4321
                    continue
 
4322
                # TODO: key is often going to be a StaticTuple object
 
4323
                #       I don't believe we can define a method by which
 
4324
                #       (prefix,) + StaticTuple will work, though we could
 
4325
                #       define a StaticTuple.sq_concat that would allow you to
 
4326
                #       pass in either a tuple or a StaticTuple as the second
 
4327
                #       object, so instead we could have:
 
4328
                #       StaticTuple(prefix) + key here...
4322
4329
                missing_keys.update((prefix,) + key for key in
4323
4330
                    versioned_file.get_missing_compression_parent_keys())
4324
4331
        except NotImplementedError: