← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/versioned/__init__.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
# XXX: Some consideration of the problems that might occur if there are
18
20
# files whose id differs only in case.  That should probably be forbidden.
19
21
 
217
219
                 "is deprecated. Please provide a to_transaction.",
218
220
                 DeprecationWarning,
219
221
                 stacklevel=2)
220
 
            # we are copying single objects, and there may be open tranasactions
 
222
            # we are copying single objects, and there may be open transactions
221
223
            # so again with the passthrough
222
224
            to_transaction = PassThroughTransaction()
223
225
        pb = bzrlib.ui.ui_factory.nested_progress_bar()