Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 581350 - End-of-line format in patches isn't preserved when GitHub PR is added to the tree
Summary: End-of-line format in patches isn't preserved when GitHub PR is added to the ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Unspecified (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Jonas Stein
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-04-27 11:29 UTC by Azamat H. Hackimov
Modified: 2017-12-19 21:43 UTC (History)
4 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Azamat H. Hackimov 2016-04-27 11:29:28 UTC
Hello.

I'm proxied maintainer of dev-games/aseprite.

I got second bug about failed patching (https://bugs.gentoo.org/show_bug.cgi?id=581298). First time I thought that I mistake with patches and included outdated file. But now I done little investigation and found that my patches from PR (https://github.com/gentoo/gentoo/pull/1322) are somehow changed during merging.

Here MD5s from my branch and from official gentoo repository:

b487e5dd7f2d22897e32e6e0e40792b9  aseprite-1.1.4.1_underlinking.patch # mine
7baec88356cf985c75045ccb2d3b29ad  aseprite-1.1.4.1_underlinking.patch # gentoo

Since original package uses Windows-like end-of-lines, I forced to use same in patch. But after merging they are converted to Unix-like end-of-lines, and patching are totally broken. What can I do?
Comment 1 Jonas Stein gentoo-dev 2017-12-19 21:43:18 UTC
I do not expect, that we want Windows line breaks in the tree.
Patches can be uploaded to any reliable server.
You could ask any developer, to copy patches for you to his devspace.
Just ask on IRC for example in the proxy channel.
You can put them even on your domain.