Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 10596:7648f32713f2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch: help misuse of hg branch to switch branches Maybe beginners tend to use 'hg branch EXISTING_BRANCH' instead of 'hg update EXISTING_BRANCH' as me. If so, let's help them to use 'update'. Also removed '(use --force to override)' because it can mislead them.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 12 Jan 2010 22:49:10 +0900
parents f142fa3c0a8c
children e764f24a45ee 65b178f30eae
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Mar 06 21:29:02 2010 -0800
+++ b/mercurial/commands.py	Tue Jan 12 22:49:10 2010 +0900
@@ -451,7 +451,7 @@
         if not opts.get('force') and utflabel in repo.branchtags():
             if label not in [p.branch() for p in repo.parents()]:
                 raise util.Abort(_('a branch of the same name already exists'
-                                   ' (use --force to override)'))
+                                   " (use 'hg update' to switch to it)"))
         repo.dirstate.setbranch(utflabel)
         ui.status(_('marked working directory as branch %s\n') % label)
     else: