Show More
@@ -288,6 +288,8 b' class mergestate(object):' | |||||
288 |
|
288 | |||
289 | @util.propertycache |
|
289 | @util.propertycache | |
290 | def otherctx(self): |
|
290 | def otherctx(self): | |
|
291 | if self._other is None: | |||
|
292 | raise RuntimeError("localctx accessed but self._local isn't set") | |||
291 | return self._repo[self._other] |
|
293 | return self._repo[self._other] | |
292 |
|
294 | |||
293 | def active(self): |
|
295 | def active(self): |
General Comments 0
You need to be logged in to leave comments.
Login now