Mercurial > hg
changeset 26996:bf3eec62212f
localrepo.commit: switch to mergestate.read()
See previous patches for why we're doing this.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 17 Nov 2015 13:58:50 -0800 |
| parents | d5a6be56970b |
| children | 1791f9aa782f |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Nov 17 13:57:38 2015 -0800 +++ b/mercurial/localrepo.py Tue Nov 17 13:58:50 2015 -0800 @@ -1556,7 +1556,7 @@ raise error.Abort(_("cannot commit merge with missing files")) unresolved, driverresolved = False, False - ms = mergemod.mergestate(self) + ms = mergemod.mergestate.read(self) for f in status.modified: if f in ms: if ms[f] == 'u':