/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/multiparent.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/multiparent.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
 
 
19
17
import errno
 
18
from io import (
 
19
    BytesIO,
 
20
    )
20
21
import os
21
22
 
22
23
from .lazy_import import lazy_import
35
36
    errors,
36
37
    )
37
38
from .i18n import gettext
38
 
from .sixish import (
39
 
    BytesIO,
40
 
    range,
41
 
    )
42
39
 
43
40
 
44
41
def topo_iter_keys(vf, keys=None):