mercurial/dirstate.py
changeset 10420 41d0ed2c79df
parent 10394 4612cded5176
parent 10417 58e040c51231
child 10836 e5aaa4543289
equal deleted inserted replaced
10419:992dc3d39357 10420:41d0ed2c79df
   206     def setparents(self, p1, p2=nullid):
   206     def setparents(self, p1, p2=nullid):
   207         self._dirty = self._dirtypl = True
   207         self._dirty = self._dirtypl = True
   208         self._pl = p1, p2
   208         self._pl = p1, p2
   209 
   209 
   210     def setbranch(self, branch):
   210     def setbranch(self, branch):
       
   211         if branch in ['tip', '.', 'null']:
       
   212             raise util.Abort(_('the name \'%s\' is reserved') % branch)
   211         self._branch = branch
   213         self._branch = branch
   212         self._opener("branch", "w").write(branch + '\n')
   214         self._opener("branch", "w").write(branch + '\n')
   213 
   215 
   214     def _read(self):
   216     def _read(self):
   215         self._map = {}
   217         self._map = {}