← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2007-03-13 16:59:44 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2359.
  • Revision ID: abentley@panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
Decoded revision ids are utf-8

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
115
115
                kwargs[key] = stanza.get(key)
116
116
            except KeyError:
117
117
                pass
 
118
        kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
118
119
        return MergeDirective(time=time, timezone=timezone,
119
120
                              patch_type=patch_type, patch=patch, **kwargs)
120
121