← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-18 17:24:52 UTC
  • mfrom: (6468.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120218172452-x7mk642v7mwxtyo1
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3874
3874
class cmd_nick(Command):
3875
3875
    __doc__ = """Print or set the branch nickname.
3876
3876
 
3877
 
    If unset, the tree root directory name is used as the nickname.
3878
 
    To print the current nickname, execute with no argument.
 
3877
    If unset, the colocated branch name is used for colocated branches, and
 
3878
    the branch directory name is used for other branches.  To print the
 
3879
    current nickname, execute with no argument.
3879
3880
 
3880
3881
    Bound branches use the nickname of its master branch unless it is set
3881
3882
    locally.