diff mercurial/dirstate.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 7b0b1da49f15
children 1683bca31752 3bc21f6daac4
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Nov 28 11:20:56 2012 +0100
+++ b/mercurial/dirstate.py	Tue Nov 27 08:47:35 2012 -0500
@@ -261,7 +261,6 @@
 
     def setbranch(self, branch):
         # no repo object here, just check for reserved names
-        scmutil.checknewlabel(None, branch, 'branch')
         self._branch = encoding.fromlocal(branch)
         f = self._opener('branch', 'w', atomictemp=True)
         try: