~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Aaron Bentley
  • Date: 2007-08-20 13:07:12 UTC
  • mfrom: (2732 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2733.
  • Revision ID: abentley@panoramicfeedback.com-20070820130712-buopmg528zcgwyxc
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
201
201
            revprops = {}
202
202
        if not 'branch-nick' in revprops:
203
203
            revprops['branch-nick'] = self.branch.nick
 
204
        author = kwargs.pop('author', None)
 
205
        if author is not None:
 
206
            assert 'author' not in revprops
 
207
            revprops['author'] = author
204
208
        # args for wt.commit start at message from the Commit.commit method,
205
209
        args = (message, ) + args
206
210
        committed_id = commit.Commit().commit(working_tree=self,