##// END OF EJS Templates
merge.mergestate: add a generator for driver-resolved files...
Siddharth Agarwal -
r26740:f4a27c05 default
parent child Browse files
Show More
@@ -329,6 +329,13 b' class mergestate(object):'
329 if entry[0] == 'u':
329 if entry[0] == 'u':
330 yield f
330 yield f
331
331
332 def driverresolved(self):
333 """Obtain the paths of driver-resolved files."""
334
335 for f, entry in self._state.items():
336 if entry[0] == 'd':
337 yield f
338
332 def _resolve(self, preresolve, dfile, wctx, labels=None):
339 def _resolve(self, preresolve, dfile, wctx, labels=None):
333 """rerun merge process for file path `dfile`"""
340 """rerun merge process for file path `dfile`"""
334 if self[dfile] in 'rd':
341 if self[dfile] in 'rd':
General Comments 0
You need to be logged in to leave comments. Login now