/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/store/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2008-10-02 06:18:42 UTC
  • mfrom: (3757 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3759.
  • Revision ID: v.ladeuil+lp@free.fr-20081002061842-4ctag1pkr7ua9gu2
Fix conflict. Related to moved lines, nice use case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/__init__.py
25
25
"""
26
26
 
27
27
import os
28
 
from cStringIO import StringIO
29
 
import urllib
30
 
from zlib import adler32
31
28
 
32
 
import bzrlib
33
29
from bzrlib import (
34
30
    errors,
35
 
    osutils,
36
 
    symbol_versioning,
37
 
    urlutils,
38
31
    versionedfile,
39
32
    )
40
 
from bzrlib.errors import BzrError, UnlistableStore, TransportNotPossible
41
 
from bzrlib.symbol_versioning import (
42
 
    deprecated_function,
43
 
    )
 
33
from bzrlib.errors import BzrError, UnlistableStore
44
34
from bzrlib.trace import mutter
45
 
from bzrlib.transport import Transport
46
 
from bzrlib.transport.local import LocalTransport
47
35
 
48
36
######################################################################
49
37
# stores