diff mercurial/commands.py @ 15611:ec8a49c46d7e

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Dec 2011 17:48:40 -0600
parents a348739da8f0 09b200396384
children 260a6449d83a
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Dec 02 18:36:32 2011 +0100
+++ b/mercurial/commands.py	Mon Dec 05 17:48:40 2011 -0600
@@ -826,6 +826,11 @@
 def branch(ui, repo, label=None, **opts):
     """set or show the current branch name
 
+    .. note::
+       Branch names are permanent and global. Use :hg:`bookmark` to create a
+       light-weight bookmark instead. See :hg:`help glossary` for more
+       information about named branches and bookmarks.
+
     With no argument, show the current branch name. With one argument,
     set the working directory branch name (the branch will not exist
     in the repository until the next commit). Standard practice
@@ -842,11 +847,6 @@
     Use the command :hg:`update` to switch to an existing branch. Use
     :hg:`commit --close-branch` to mark this branch as closed.
 
-    .. note::
-       Branch names are permanent. Use :hg:`bookmark` to create a
-       light-weight bookmark instead. See :hg:`help glossary` for more
-       information about named branches and bookmarks.
-
     Returns 0 on success.
     """