Submitter | timeless@mozdev.org |
---|---|
Date | March 22, 2016, 10:21 p.m. |
Message ID | <0ff0274cf3ca9d66dd86.1458685309@waste.org> |
Download | mbox | patch |
Permalink | /patch/14028/ |
State | Superseded |
Headers | show |
Comments
farnz has convinced me that we don't want to do this commit at all. I'm reworking the rest of this series.
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -167,6 +167,14 @@ self._stateextras[filename] = extras elif not rtype.islower(): unsupported.add(rtype) + if self._local is None or self._other is None: + parents = self._repo[None].parents() + if len(parents) == 2: + # we have two parents, we have a merge, but no conflicts. + p1, p2 = parents + self._local = p1.node() + self._other = p2.node() + self._results = {} self._dirty = False