pijul_org / pijul

#183 pijul/Cargo.toml conflict

Opened by rsmith, on September 15, 2017
Closed
rsmith commented on September 15, 2017

I'm seeing a conflict in pijul/Cargo.toml in the current master tip toward the end of the file https://nest.pijul.com/pijul_org/pijul:master/b69e09cf58f63c468024

It has been there at least the last 2 days, even with new patches being added to Cargo.toml yesterday: https://nest.pijul.com/pijul_org/pijul/patches/AWy5oiJ3zIvOyg26n1GhV02p2koQs45lx83M55MYSW4dwnkuduxlRwmhu_QVFE99xgHStDDdatuIf17KKCfR8ok

When I clone and build, it fails. It passes when I remove the edit markers. Is anyone else seeing this?

pmeunier commented on September 15, 2017

Yes, thanks for reporting. This is a known issue, we're currently in the process of fixing it.

pmeunier commented on September 15, 2017

Ok, after cleaning the Nest with the new libpijul 0.8.1, the conflict is gone.

Make sure to run cargo update before compiling.

Thanks!

rsmith commented on September 15, 2017

Looks good. Thanks for the fast response!