Submitter | Siddharth Agarwal |
---|---|
Date | Oct. 14, 2015, 11:52 p.m. |
Message ID | <9f41136f7fa1528e1644.1444866753@dev6666.prn1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/11083/ |
State | Accepted |
Commit | f4a27c05c43f78c4a94d7749ee6039df6bce33d3 |
Delegated to: | Pierre-Yves David |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -329,6 +329,13 @@ class mergestate(object): if entry[0] == 'u': yield f + def driverresolved(self): + """Obtain the paths of driver-resolved files.""" + + for f, entry in self._state.items(): + if entry[0] == 'd': + yield f + def _resolve(self, preresolve, dfile, wctx, labels=None): """rerun merge process for file path `dfile`""" if self[dfile] in 'rd':