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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-07 20:37:53 UTC
  • mfrom: (7058.3.13 random)
  • Revision ID: breezy.the.bot@gmail.com-20180807203753-nl79574d8e7hmqfo
Fix a couple of flappy tests.

Merged from https://code.launchpad.net/~jelmer/brz/random/+merge/352328

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
1128
1128
            }
1129
1129
        yield serializer.bytes_record(bencode.bencode(attribs),
1130
1130
                                      ((b'attribs',),))
1131
 
        for trans_id, kind in viewitems(self._new_contents):
 
1131
        for trans_id, kind in sorted(viewitems(self._new_contents)):
1132
1132
            if kind == 'file':
1133
1133
                with open(self._limbo_name(trans_id), 'rb') as cur_file:
1134
1134
                    lines = cur_file.readlines()