The officially official Devuan Forum!

You are not logged in.

#1 2023-06-08 23:26:44

zapper
Member
Registered: 2017-05-29
Posts: 905  

[SOLVED] git program for easy automated fixes

I wanted to know, if antyone knows of a way to either A: remove git patches quickly that don't work for a specific compilation, explained below:

In my case, there is this one uxp patch that I have that is broken and refuses to apply because of a few things that are no longer relevant.

I want to either A: bypass them, so I can apply the needed ones to the repo.

or B: remove the problematic ones in the patch that no longer are needed.

I want an automated way to do this, because otherwise I have to sort 1000+ patches on a stupidly regular basis lol.

In my case the patch file in question looks like this:

https://upload.disroot.org/r/wGTfuasx#k … 6/Gac3lxs=

I attached it to this upload area.

I need to remove all mentions that don't work now.

Does anyone know a way to remove the problematic changes, aka the ones that cannot or do not apply

Or be able to force only the patches that work to apply

Thanks in advance for whomever can help.

PS, I don't care if this program is on Devuan or Hyperbola. I have both so... yeah

wink

Last edited by zapper (2023-06-08 23:30:14)


Freedom is never more than one generation away from extinction. Feelings are not facts
If you wish to be humbled, try to exalt yourself long term  If you wish to be exalted, try to humble yourself long term
Favourite operating systems: Hyperbola Devuan OpenBSD
Peace Be With us All!

Offline

#2 2023-06-09 09:04:37

soren
Member
Registered: 2023-04-30
Posts: 126  

Re: [SOLVED] git program for easy automated fixes

Do you mean remove mentions in that file with 12K lines of all the mentions that dont work?
You would need to get a list of the ones that dont work and comment them out in that file so they dont run.

Offline

#3 2023-06-09 13:04:52

boughtonp
Member
From: UK
Registered: 2023-01-19
Posts: 212  
Website

Re: [SOLVED] git program for easy automated fixes


3.1415P265E589T932E846R64338

Offline

#4 2023-06-10 15:03:13

zapper
Member
Registered: 2017-05-29
Posts: 905  

Re: [SOLVED] git program for easy automated fixes

soren wrote:

Do you mean remove mentions in that file with 12K lines of all the mentions that dont work?
You would need to get a list of the ones that dont work and comment them out in that file so they dont run.

Yes exactly


Freedom is never more than one generation away from extinction. Feelings are not facts
If you wish to be humbled, try to exalt yourself long term  If you wish to be exalted, try to humble yourself long term
Favourite operating systems: Hyperbola Devuan OpenBSD
Peace Be With us All!

Offline

#5 2023-06-10 15:05:01

zapper
Member
Registered: 2017-05-29
Posts: 905  

Re: [SOLVED] git program for easy automated fixes

boughtonp wrote:

AH! I just found git apply --reject

thank you 1000%


Freedom is never more than one generation away from extinction. Feelings are not facts
If you wish to be humbled, try to exalt yourself long term  If you wish to be exalted, try to humble yourself long term
Favourite operating systems: Hyperbola Devuan OpenBSD
Peace Be With us All!

Offline

Board footer