Mercurial > hg
changeset 10596:7648f32713f2 stable
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 | 47f9868d8dcf |
| children | 153d688cdd06 |
| files | mercurial/commands.py tests/test-newbranch.out |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
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:
--- a/tests/test-newbranch.out Sat Mar 06 21:29:02 2010 -0800 +++ b/tests/test-newbranch.out Tue Jan 12 22:49:10 2010 +0900 @@ -2,7 +2,7 @@ foo marked working directory as branch bar % branch shadowing -abort: a branch of the same name already exists (use --force to override) +abort: a branch of the same name already exists (use 'hg update' to switch to it) marked working directory as branch default % there should be only one default branch head changeset: 3:bf1bc2f45e83