Date: Thu, 27 Jul 2006 15:34:00 +0200 From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de> To: "M. Warner Losh" <imp@bsdimp.com> Cc: obrien@freebsd.org, cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, jhb@freebsd.org Subject: Re: cvs commit: src/share/mk bsd.cpu.mk Message-ID: <44C8C0C8.4090906@fs.ei.tum.de> In-Reply-To: <20060725.113631.58461185.imp@bsdimp.com> References: <200607241340.00106.jhb@freebsd.org> <20060725034147.GB68567@dragon.NUXI.org> <200607251229.17862.jhb@freebsd.org> <20060725.113631.58461185.imp@bsdimp.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigA7DE94CFEC53D6FA533A9C96
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable
M. Warner Losh wrote:
> We need to find some way to accomplish having local changes in the
> tree that doesn't screw new imports.
Maybe I am missing something important here, but where is the problem wit=
h modifying files and taking them off the vendor branch?
Situation 1: the vendor sources don't include the feature that is implem=
ented in the local changes. -> The file needs to stay off the vendor bra=
nch.
Situation 2: the vendor sources integrated the modifications and these s=
ources and the local (off-vendor-branch) sources are the same. -> just p=
ut the file on the vendor branch again (basically cvs admin -b1.1.1)
another interim solution is the way we are handling it for DragonFly: ha=
ve patches somewhere else and apply them automatically during the build p=
rocess (we have a bsd.patch.mk for that. just set SRCS+=3D file1.c.patch=
file2.c.patch)
Not sure if you are referencing this, of course
cheers
simon
--=20
Serve - BSD +++ RENT this banner advert +++ ASCII Ribbon /"\
Work - Mac +++ space for low =E2=82=AC=E2=82=AC=E2=82=AC NOW!1 +++=
Campaign \ /
Party Enjoy Relax | http://dragonflybsd.org Against HTML \
Dude 2c 2 the max ! http://golden-apple.biz Mail + News / \
--------------enigA7DE94CFEC53D6FA533A9C96
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (DragonFly)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFEyMDLr5S+dk6z85oRAqKRAKDAhkVSA7sKfGwHmreq5wWuMBM0wQCgrVI9
A4/uT51xp0N+wAzTGxBVye0=
=BIdY
-----END PGP SIGNATURE-----
--------------enigA7DE94CFEC53D6FA533A9C96--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44C8C0C8.4090906>