/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 breezy/bzr/weave.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/weave.py
18
18
 
19
19
"""Weave - storage of related text file versions"""
20
20
 
21
 
from __future__ import absolute_import
22
 
 
23
21
# XXX: If we do weaves this way, will a merge still behave the same
24
22
# way if it's done in a different order?  That's a pretty desirable
25
23
# property.
67
65
# FIXME: the conflict markers should be *7* characters
68
66
 
69
67
from copy import copy
 
68
from io import BytesIO
70
69
import os
71
70
import patiencediff
72
71
 
85
84
    )
86
85
from ..osutils import dirname, sha, sha_strings, split_lines
87
86
from ..revision import NULL_REVISION
88
 
from ..sixish import (
89
 
    BytesIO,
90
 
    )
91
87
from ..trace import mutter
92
88
from .versionedfile import (
93
89
    AbsentContentFactory,