diff mercurial/commands.py @ 17984:b74361cf7c0a stable

update: allow update to existing branches with invalid names (issue3710) Starting with 361ab1e2086f, users are no longer able to update a working copy to a branch named with a "bad" character (such as ':'). Prior to v2.4, it was possible to create branch names using "bad" characters, so this breaks backwards compatibility. Mercurial must allow users to update to existing branches with bad names. However, it should continue to prevent the creation of new branches with bad names. A test was added to confirm that 'hg update' works as expected. The test uses a bundled repo that was created with an earlier version of Mercurial.
author Tim Henigan <tim.henigan@gmail.com>
date Tue, 27 Nov 2012 08:47:35 -0500
parents e689b0d91546
children e853d27956fb 730b769fb634
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Nov 28 11:20:56 2012 +0100
+++ b/mercurial/commands.py	Tue Nov 27 08:47:35 2012 -0500
@@ -924,6 +924,7 @@
                                        ' exists'),
                                      # i18n: "it" refers to an existing branch
                                      hint=_("use 'hg update' to switch to it"))
+            scmutil.checknewlabel(None, label, 'branch')
             repo.dirstate.setbranch(label)
             ui.status(_('marked working directory as branch %s\n') % label)
             ui.status(_('(branches are permanent and global, '