[Regression] Bad merge when adding new files

[piranna]

When adding a new file, first line of new file is removed from file beggining and added at the end of the new file, corrupting data. This works correctly with diff 3.0.1, so it got broken in some moment after that.

[piranna]

Doing a git bisect it shows the regression was added at d8a3635

[piranna]

I'm having troubles to fix the regression... reverting the changes my test works but the added ones fails, adding the changes to the end. @tyomitch, can you help here?

[tyomitch]

@piranna would you try #192

[piranna]

@piranna would you try #192

Tests seems to pass, do you ask that I try it on real code?

[tyomitch]

Yes, on whatever alerted you of this bug in the first place.

[piranna]

Yes, on whatever alerted you of this bug in the first place.

Ok, I tried it on https://github.com/piranna/BarebonesOS-linux and it failed :-(

[tyomitch]

@piranna how do I reproduce the failure with BarebonesOS-linux?
npm install succeeds for me, then npm run build fails saying "missing script: build" (and it's indeed missing).

[piranna]

@tyomitch it was my fault, I was using an in-development version of BarebonesOS-linux that in fact was not working. I re-check it again with master and it works, so I can confirm that your pull-requests fix the regression also on real world code. I propose to merge it and publish a new version.

[piranna]

I have check it again with the in-development version after fixing it and can confirm again that @tyomitch changes has fixed my issue :-) Can we merge and publish them?

[piranna]

Sorry, didn't see it was merged yesterday. Can we publish it to npm so we can close this issue? And what we do with the pull-request with the faling test? Should we merge it too?

[kpdecker]

My plan is to release a version early this week. Want to try to get all outstanding PRs in first.

…

On Mon, Aug 28, 2017 at 10:40 AM Jesús Leganés-Combarro < ***@***.***> wrote: Sorry, didn't see it was merged yesterday. Can we publish it to npm so we can close this issue? And what we do with the pull-request with the faling test? Should we merge it too? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#189 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAL_Ju8mJPBChOfmA2wwzUX_KGP5GUXIks5sct9rgaJpZM4O3cYB> .

[tyomitch]

And what we do with the pull-request with the faling test? Should we merge it too?

#192 included your test case.

[piranna]

My plan is to release a version early this week. Want to try to get all
outstanding PRs in first.

That would be cool, thanks :-)

[piranna]

Since this is already fixed on master, can it be published a new version on npm? I have several packages broken and development stopped due to this dependency...

[kpdecker]

Released in v3.3.1

[piranna]

Thank you :-)