equal
deleted
inserted
replaced
264 self._dirty = self._dirtypl = True |
264 self._dirty = self._dirtypl = True |
265 oldp2 = self._pl[1] |
265 oldp2 = self._pl[1] |
266 self._pl = p1, p2 |
266 self._pl = p1, p2 |
267 copies = {} |
267 copies = {} |
268 if oldp2 != nullid and p2 == nullid: |
268 if oldp2 != nullid and p2 == nullid: |
269 # Discard 'm' markers when moving away from a merge state |
|
270 for f, s in self._map.iteritems(): |
269 for f, s in self._map.iteritems(): |
|
270 # Discard 'm' markers when moving away from a merge state |
271 if s[0] == 'm': |
271 if s[0] == 'm': |
272 if f in self._copymap: |
272 if f in self._copymap: |
273 copies[f] = self._copymap[f] |
273 copies[f] = self._copymap[f] |
274 self.normallookup(f) |
274 self.normallookup(f) |
|
275 # Also fix up otherparent markers |
|
276 elif s[0] == 'n' and s[2] == -2: |
|
277 if f in self._copymap: |
|
278 copies[f] = self._copymap[f] |
|
279 self.add(f) |
275 return copies |
280 return copies |
276 |
281 |
277 def setbranch(self, branch): |
282 def setbranch(self, branch): |
278 self._branch = encoding.fromlocal(branch) |
283 self._branch = encoding.fromlocal(branch) |
279 f = self._opener('branch', 'w', atomictemp=True) |
284 f = self._opener('branch', 'w', atomictemp=True) |