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

Georges Racinet georges.racinet at octobus.net
Fri Apr 19 04:15:12 EDT 2019


On 4/19/19 12:32 AM, Yuya Nishihara wrote:
>> 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.

Ah ok, so then, I should have untied D6229 from D6228 after I abandoned
the latter.

>
> Phabricator sucks.

For the record, I don't like it too much either, and I noticed you
prefer email interaction. That's why I'm sending patches that I don't
feel need  special attention by Kevin by email… and utimately ended up
submitting D6228 both ways…

Anyway, thanks for the queueing


-- 
Georges Racinet
https://octobus.net
GPG: BF5456F4DC625443849B6E58EE20CA44EF691D39, sur serveurs publics


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20190419/f6f2b987/attachment.sig>


More information about the Mercurial-devel mailing list