← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-09 13:30:12 UTC
  • mfrom: (5609.48.11 2.3)
  • mto: (6015.33.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: v.ladeuil+lp@free.fr-20110909133012-jc1d1zyqgak57123
Merge 2.3 into 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
69
69
from copy import copy
70
70
from cStringIO import StringIO
71
71
import os
72
 
import time
73
 
import warnings
74
72
 
75
73
from bzrlib.lazy_import import lazy_import
76
74
lazy_import(globals(), """
79
77
from bzrlib import (
80
78
    errors,
81
79
    osutils,
82
 
    progress,
83
80
    )
84
81
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
85
82
        RevisionAlreadyPresent,
86
83
        RevisionNotPresent,
87
84
        UnavailableRepresentation,
88
 
        WeaveRevisionAlreadyPresent,
89
 
        WeaveRevisionNotPresent,
90
85
        )
91
86
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
92
87
import bzrlib.patiencediff