/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/builtins.py

  • Committer: Martin Pool
  • Date: 2009-03-05 02:15:46 UTC
  • mfrom: (4078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4081.
  • Revision ID: mbp@sourcefrog.net-20090305021546-catovbht4xnwypto
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
2633
2633
    If author of the change is not the same person as the committer, you can
2634
2634
    specify the author's name using the --author option. The name should be
2635
2635
    in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
 
2636
    If there is more than one author of the change you can specify the option
 
2637
    multiple times, once for each author.
2636
2638
 
2637
2639
    A selected-file commit may fail in some cases where the committed
2638
2640
    tree would be invalid. Consider::
2682
2684
                    "files in the working tree."),
2683
2685
             ListOption('fixes', type=str,
2684
2686
                    help="Mark a bug as being fixed by this revision."),
2685
 
             Option('author', type=unicode,
 
2687
             ListOption('author', type=unicode,
2686
2688
                    help="Set the author's name, if it's different "
2687
2689
                         "from the committer."),
2688
2690
             Option('local',
2785
2787
                        specific_files=selected_list,
2786
2788
                        allow_pointless=unchanged, strict=strict, local=local,
2787
2789
                        reporter=None, verbose=verbose, revprops=properties,
2788
 
                        author=author,
 
2790
                        authors=author,
2789
2791
                        exclude=safe_relpath_files(tree, exclude))
2790
2792
        except PointlessCommit:
2791
2793
            # FIXME: This should really happen before the file is read in;