Mercurial > public > mercurial-scm > hg

diff mercurial/dirstate.py @ 10420:41d0ed2c79df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Feb 2010 17:44:01 -0600
parents 4612cded5176 58e040c51231
children e5aaa4543289
line wrap: on
line diff
--- a/mercurial/dirstate.py	Thu Feb 11 17:13:22 2010 -0600
+++ b/mercurial/dirstate.py	Thu Feb 11 17:44:01 2010 -0600
@@ -208,6 +208,8 @@
         self._pl = p1, p2
 
     def setbranch(self, branch):
+        if branch in ['tip', '.', 'null']:
+            raise util.Abort(_('the name \'%s\' is reserved') % branch)
         self._branch = branch
         self._opener("branch", "w").write(branch + '\n')