Show More
@@ -55,6 +55,8 b' class mergestate(object):' | |||||
55 |
|
55 | |||
56 | def reset(self, node=None, other=None): |
|
56 | def reset(self, node=None, other=None): | |
57 | self._state = {} |
|
57 | self._state = {} | |
|
58 | self._local = None | |||
|
59 | self._other = None | |||
58 | if node: |
|
60 | if node: | |
59 | self._local = node |
|
61 | self._local = node | |
60 | self._other = other |
|
62 | self._other = other | |
@@ -68,6 +70,8 b' class mergestate(object):' | |||||
68 | of on disk file. |
|
70 | of on disk file. | |
69 | """ |
|
71 | """ | |
70 | self._state = {} |
|
72 | self._state = {} | |
|
73 | self._local = None | |||
|
74 | self._other = None | |||
71 | records = self._readrecords() |
|
75 | records = self._readrecords() | |
72 | for rtype, record in records: |
|
76 | for rtype, record in records: | |
73 | if rtype == 'L': |
|
77 | if rtype == 'L': |
General Comments 0
You need to be logged in to leave comments.
Login now