Commit dc2caea4 authored by Yuya Nishihara's avatar Yuya Nishihara

tests: fix GraphBuilder to properly detect merge conflicts on graft

Otherwise the tests wouldn't pass with Mercurial 5.4.
parent 5c8b2e59a13e
......@@ -508,8 +508,10 @@ class GraphBuilder(object):
uargs = []
hg.graft('-r', source, '-t', tool, *uargs)
ret = hg.graft('-r', source, '-t', tool, *uargs)[0]
except error.Abort:
ret = 1
if ret:
self._resolveall(parents[0], int(source))
self._runcmd(hg.graft, '-c', *uargs)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment