# HG changeset patch # User Matt Mackall # Date 1323126551 21600 # Node ID 09b200396384b5e3b184c551c5ce348faa995771 # Parent 8f4bad72d8b15d3feb803e58f750e75853835a06 branch: move note about permanence to the top, add 'global' diff -r 8f4bad72d8b1 -r 09b200396384 mercurial/commands.py --- a/mercurial/commands.py Sun Dec 04 18:22:25 2011 +0100 +++ b/mercurial/commands.py Mon Dec 05 17:09:11 2011 -0600 @@ -819,6 +819,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 @@ -835,11 +840,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. """