← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-26 19:10:00 UTC
  • mfrom: (2552.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070626191000-flte155pupv54bcs
(Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3536
3536
            help='Message to use when committing this merge')
3537
3537
        ]
3538
3538
 
 
3539
    encoding_type = 'exact'
 
3540
 
3539
3541
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3540
3542
            sign=False, revision=None, mail_to=None, message=None):
3541
3543
        from bzrlib.revision import ensure_null, NULL_REVISION