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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge_directive.py
455
455
            except KeyError:
456
456
                pass
457
457
        kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
 
458
        if 'testament_sha1' in kwargs:
 
459
            kwargs['testament_sha1'] = kwargs['testament_sha1'].encode('ascii')
458
460
        return MergeDirective(time=time, timezone=timezone,
459
461
                              patch_type=patch_type, patch=patch, **kwargs)
460
462