Show More
@@ -89,8 +89,11 b' class mergestate(object):' | |||||
89 | if node: |
|
89 | if node: | |
90 | self._local = node |
|
90 | self._local = node | |
91 | self._other = other |
|
91 | self._other = other | |
92 | self._mdstate = 'u' |
|
|||
93 | self._readmergedriver = None |
|
92 | self._readmergedriver = None | |
|
93 | if self.mergedriver: | |||
|
94 | self._mdstate = 's' | |||
|
95 | else: | |||
|
96 | self._mdstate = 'u' | |||
94 | shutil.rmtree(self._repo.join('merge'), True) |
|
97 | shutil.rmtree(self._repo.join('merge'), True) | |
95 | self._dirty = False |
|
98 | self._dirty = False | |
96 |
|
99 | |||
@@ -103,10 +106,10 b' class mergestate(object):' | |||||
103 | self._state = {} |
|
106 | self._state = {} | |
104 | self._local = None |
|
107 | self._local = None | |
105 | self._other = None |
|
108 | self._other = None | |
106 | self._mdstate = 'u' |
|
|||
107 | if 'otherctx' in vars(self): |
|
109 | if 'otherctx' in vars(self): | |
108 | del self.otherctx |
|
110 | del self.otherctx | |
109 | self._readmergedriver = None |
|
111 | self._readmergedriver = None | |
|
112 | self._mdstate = 's' | |||
110 | records = self._readrecords() |
|
113 | records = self._readrecords() | |
111 | for rtype, record in records: |
|
114 | for rtype, record in records: | |
112 | if rtype == 'L': |
|
115 | if rtype == 'L': |
General Comments 0
You need to be logged in to leave comments.
Login now