[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: How to handle patches during a routine update ?



Hey Charles,

Here is what I do in this circumstance.

1. `quilt pop -a` to remove all patches
2. `quilt push` one patch at a time. If I see that there was any fuzzing, then I do a `quilt refresh` before the next `quilt push`.
3. If a patch does apply cleanly I investigate to see if it should be removed entirely with `quilt delete patchname && git rm debian/patches/patchname` or fixed via `quilt push -f` and editing the files indicated in one terminal while reviewing the corresponding `*.rej` files in another terminal. `quilt refresh` when I'm done fixing the patch, then continue with step 2
4. When I'm done, I `dch "Refreshed patches" && debcommit -a` or similar

Maybe others have a better method, I'm curious to hear from them as well.

Cheers,

On Wed, Aug 12, 2020 at 12:03 PM Charles Plessy <plessy@debian.org> wrote:
Hello everybody,

I did not realise how rusty my skills became...

At the moment my main problem is how to handle patch updates.

My specific question here is: after I run routine-update, the process is
paused with the following message:

    W: There is fuzz in some patches.
       Please use another terminal to inspect patches and press RET here once ready

I do not know what I am supposed to do to be ready: edit the files ?
Edit the patches ?

With your precious help, I will not only update this package but also
update the information in our team policy :)

https://med-team.pages.debian.net/policy/#handling-patches

Have a nice day,

Charles

--
Charles Plessy
Debian Med packaging team,
http://www.debian.org/devel/debian-med
Akano, Uruma, Okinawa, Japan



--
Michael R. Crusoe

Reply to: