Show More
@@ -84,6 +84,8 b' class mergestate(object):' | |||||
84 | self._state = {} |
|
84 | self._state = {} | |
85 | self._local = None |
|
85 | self._local = None | |
86 | self._other = None |
|
86 | self._other = None | |
|
87 | if 'otherctx' in vars(self): | |||
|
88 | del self.otherctx | |||
87 | if node: |
|
89 | if node: | |
88 | self._local = node |
|
90 | self._local = node | |
89 | self._other = other |
|
91 | self._other = other | |
@@ -101,6 +103,8 b' class mergestate(object):' | |||||
101 | self._local = None |
|
103 | self._local = None | |
102 | self._other = None |
|
104 | self._other = None | |
103 | self._mdstate = 'u' |
|
105 | self._mdstate = 'u' | |
|
106 | if 'otherctx' in vars(self): | |||
|
107 | del self.otherctx | |||
104 | records = self._readrecords() |
|
108 | records = self._readrecords() | |
105 | for rtype, record in records: |
|
109 | for rtype, record in records: | |
106 | if rtype == 'L': |
|
110 | if rtype == 'L': | |
@@ -233,6 +237,9 b' class mergestate(object):' | |||||
233 | @util.propertycache |
|
237 | @util.propertycache | |
234 | def mergedriver(self): |
|
238 | def mergedriver(self): | |
235 | return self._repo.ui.config('experimental', 'mergedriver') |
|
239 | return self._repo.ui.config('experimental', 'mergedriver') | |
|
240 | @util.propertycache | |||
|
241 | def otherctx(self): | |||
|
242 | return self._repo[self._other] | |||
236 |
|
243 | |||
237 | def active(self): |
|
244 | def active(self): | |
238 | """Whether mergestate is active. |
|
245 | """Whether mergestate is active. |
General Comments 0
You need to be logged in to leave comments.
Login now