← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-08-10 07:12:32 UTC
  • mfrom: (2687.2.2 rename-0.19)
  • Revision ID: pqm@pqm.ubuntu.com-20070810071232-0ndzwbob5juuzaus
(mbp) rename 0.19 release to 0.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
325
325
 
326
326
class MergeDirective2(_BaseMergeDirective):
327
327
 
328
 
    _format_string = 'Bazaar merge directive format 2 (Bazaar 0.19)'
 
328
    _format_string = 'Bazaar merge directive format 2 (Bazaar 0.90)'
329
329
 
330
330
    def __init__(self, revision_id, testament_sha1, time, timezone,
331
331
                 target_branch, patch=None, source_branch=None, message=None,