D6233: rust-discovery: implementing and exposing stats()

Yuya Nishihara yuya at tcha.org
Thu Apr 18 18:32:56 EDT 2019


> On 4/18/19 1:29 AM, yuja (Yuya Nishihara) wrote:
> > yuja added a comment.
> >
> >
> >   Can't apply by `:D6233`. Can you rebase?
> 
> Just rebased everything onto 644eaffab9db.
> 
> >   
> >     % hg pimp :D6233
> >     applying patch from stdin
> >     patching file mercurial/setdiscovery.py
> >     Hunk #1 succeeded at 167 with fuzz 2 (offset 5 lines).
> >     Hunk #2 FAILED at 343
> >     1 out of 2 hunks FAILED -- saving rejects to file mercurial/setdiscovery.py.rej
> >     abort: patch failed to apply
> 
> I don't know 'hg pimp', but I'm a bit surprised you got a failed
> application on a file that's not modified by this revision.

It's basically `hg phabread | hg import`, and the conflict was D6228.
Excluding D6228 fixed the issue.

Phabricator sucks.


More information about the Mercurial-devel mailing list