Skip to content
Snippets Groups Projects
Commit c9223a39 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

merge.mergestate: add a wrapper around resolve

The resolve function will be broken up into separate pre-resolve and resolve
steps.
parent ef1eb6df
No related branches found
No related tags found
No related merge requests found
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
if entry[0] == 'u': if entry[0] == 'u':
yield f yield f
def resolve(self, dfile, wctx, labels=None): def _resolve(self, dfile, wctx, labels=None):
"""rerun merge process for file path `dfile`""" """rerun merge process for file path `dfile`"""
if self[dfile] == 'r': if self[dfile] == 'r':
return 0 return 0
...@@ -323,6 +323,10 @@ ...@@ -323,6 +323,10 @@
self.mark(dfile, 'r') self.mark(dfile, 'r')
return r return r
def resolve(self, dfile, wctx, labels=None):
"""rerun merge process for file path `dfile`"""
return self._resolve(dfile, wctx, labels=labels)
def _checkunknownfile(repo, wctx, mctx, f, f2=None): def _checkunknownfile(repo, wctx, mctx, f, f2=None):
if f2 is None: if f2 is None:
f2 = f f2 = f
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment