← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/versioned/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/versioned/__init__.py
219
219
                 "is deprecated. Please provide a to_transaction.",
220
220
                 DeprecationWarning,
221
221
                 stacklevel=2)
222
 
            # we are copying single objects, and there may be open tranasactions
 
222
            # we are copying single objects, and there may be open transactions
223
223
            # so again with the passthrough
224
224
            to_transaction = PassThroughTransaction()
225
225
        pb = bzrlib.ui.ui_factory.nested_progress_bar()