← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-10-04 11:38:49 UTC
  • mfrom: (6184 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6185.
  • Revision ID: v.ladeuil+lp@free.fr-20111004113849-9os4pc4swnvdklxk
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v4.py
19
19
import re
20
20
 
21
21
from bzrlib import (
22
 
    diff,
23
22
    errors,
24
23
    iterablefile,
25
24
    lru_cache,
33
32
    versionedfile as _mod_versionedfile,
34
33
    )
35
34
from bzrlib.bundle import bundle_data, serializer as bundle_serializer
36
 
from bzrlib.i18n import gettext, ngettext
 
35
from bzrlib.i18n import ngettext
37
36
from bzrlib import bencode
38
37
 
39
38