/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 bzrlib/mutabletree.py

  • Committer: Andrew Bennetts
  • Date: 2008-11-27 09:00:45 UTC
  • mfrom: (3865 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3866.
  • Revision ID: andrew.bennetts@canonical.com-20081127090045-qxatg46jzwrbh2lg
Merge bzr.dev, resolving NEWS conflict.  (And improve the wording of the new NEWS entry too.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
184
184
        possible_master_transports=[]
185
185
        if not 'branch-nick' in revprops:
186
186
            revprops['branch-nick'] = self.branch._get_nick(
 
187
                kwargs.get('local', False),
187
188
                possible_master_transports)
188
189
        author = kwargs.pop('author', None)
189
190
        if author is not None: