D7999: merge: make hg.merge() take a context instead of a node
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Jan 29 18:39:19 EST 2020
martinvonz added a comment.
In D7999#118500 <https://phab.mercurial-scm.org/D7999#118500>, @martinvonz wrote:
> In D7999#118496 <https://phab.mercurial-scm.org/D7999#118496>, @durin42 wrote:
>
>> Breaks `test-merge2.t` but otherwise seems like a good series.
>
> Doesn't break it for me (I think I just re-ran that test on all the commits in this series). I guess it's a (semantic) conflict with some other of my patches that have recently been queue. I'll rebase and try again once you're done with your current batch of queuing.
Rebase done and it still passes for me. How does it fail for you? I wonder if it's flaky. I've seen one of those tests be flaky before.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7999/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7999
To: martinvonz, #hg-reviewers, durin42
Cc: durin42, mercurial-devel
More information about the Mercurial-devel
mailing list