~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2006-03-07 12:39:38 UTC
  • mfrom: (1594 +trunk)
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060307123938-f75ff66ebcc0c4d0
Merge in bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
230
230
        self.rev_id = rev_id
231
231
        self.specific_files = specific_files
232
232
        self.allow_pointless = allow_pointless
233
 
        self.revprops = {'branch-nick': self.branch.nick}
234
 
        if revprops:
 
233
        self.revprops = {}
 
234
        if revprops is not None:
235
235
            self.revprops.update(revprops)
236
236
 
237
237
        self.work_tree.lock_write()