Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Oct 2021 16:12:48 +0100
From:      tech-lists <tech-lists@zyxst.net>
To:        freebsd-questions@freebsd.org
Subject:   manually patching a port gets overwritten when the tree updates
Message-ID:  <YVsZ8HLs1AWzXxdw@ceres.zyxst.net>

next in thread | raw e-mail | index | archive | help

--q6PMoMAiksh3WSPb
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

I thought 'git stash' would take care of this but it doesn't.

Sometimes a port breaks then a PR is raised and then sometimes someone
posts a patch. I'll apply it to my ports tree 'default' in poudriere and
build the port. If it builds ok I'll run 'git stash' then 'poudriere
ports -u -v' and the ports tree updates.

If I don't run 'git stash' the update will fail.

But if I try to build the affected port again, after successfully
updating the tree, it's as if the patch was never applied. The same sort
of thing happens with the usual ports tree (in other words, without
poudriere in the equation)

I want manually applied patches to remain applied, and I want my ports
tree to stay as current as possible. How is this accomplished?

thanks,
--=20
J.

--q6PMoMAiksh3WSPb
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE8n3tWhxW11Ccvv9/s8o7QhFzNAUFAmFbGecACgkQs8o7QhFz
NAXUeg/+JbP9bRArp5WjfO/LhGPyXklulG2+gaApvl4aKF3FdQEDz8/QL+hz+ZZt
gLl1o21+0d++qyRLFgwgDRtGBGj25DzgKHmsNY/BULFvV3lE1yVj5RCJQObDH02F
vK6Iglz+i9QBHH31S90elpN3oSOSWfjRbCaEp5qAbQpd6v6kJQ0787P7M3wa0LyM
pSY9+bkoEu9usztywIROvlph2WpXaTt8PJL9WLuIvLvdF130g0YR/jKzp2QSA0ZF
WHBs/uiUtuKqQTXWYE99JxgAxRVOXYj1VbaAjoq4alnYdG9p/WSCNBJjoRutS4nU
h/3Jg6wGHPKRugk9JnyktGl8J/kIN8FgeciVct4ex6mnvXuaFKh9Lpy3ySYQ2C+P
1deJTzzvlA8pQr43t4u6lwjg0nOMVkhcLa/brS2VYFoWy8cj9K8wGgZTaBWLOqqQ
QZisNzOWtCBHuvelHwircM0A54ZxuB+rq0Cz2tj3W7DGsWx7vxd6f4Kpny9ckXs0
TjPCzgSDs45MLp86M/cJiF2edVooIHOdvBIPB7/2RHGBWAtkQ0lSooUkddgt/vco
BMp072wYDDJ9KGebnO5Jd2cQ5luNDmacC99V+t6tb5th2ldsoAQCZfAyp4aqO78V
HmdwkHSz3MYowJm4YHAiUiSOAvsaXD3p0eFoh5wdlm9AvN74JnQ=
=VM7P
-----END PGP SIGNATURE-----

--q6PMoMAiksh3WSPb--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YVsZ8HLs1AWzXxdw>