← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v08.py

  • Committer: Aaron Bentley
  • Date: 2007-03-16 15:14:40 UTC
  • mto: This revision was merged to the branch mainline in revision 2389.
  • Revision ID: abentley@panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
Change bundle reader and merge directive to both be 'mergeables'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v08.py
29
29
from bzrlib.osutils import pathjoin
30
30
from bzrlib.progress import DummyProgress
31
31
from bzrlib.revision import NULL_REVISION
32
 
from bzrlib.rio import RioWriter, read_stanzas
33
32
import bzrlib.ui
34
33
from bzrlib.testament import StrictTestament
35
34
from bzrlib.timestamp import (
529
528
                self._next().next()
530
529
                break
531
530
 
532
 
 
533
531
class BundleInfo08(BundleInfo):
534
532
 
535
533
    def _update_tree(self, bundle_tree, revision_id):