Date: Wed, 28 Jun 2006 14:09:04 -0400 From: Charles Swiger <cswiger@mac.com> To: Paul Schmehl <pauls@utdallas.edu> Cc: FreeBSD Ports <freebsd-ports@FreeBSD.org> Subject: Re: How do I include two patches for the same file? Message-ID: <2DC9746C-8DAA-4231-8A40-23C6BCEF62EC@mac.com> In-Reply-To: <44A2BF19.6090105@utdallas.edu> References: <44A2BF19.6090105@utdallas.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Jun 28, 2006, at 1:40 PM, Paul Schmehl wrote: > I'm the maintainer for security/sancp. > > Recently a new patch was released that patches the decode.cc file. > A previous, still valid, patch, *also* patches the decode.cc file. > If I include both patches, the make fails with an error about > decode.cc You ought to merge the patches into a single set of changes which is consistent. -- -Chuck
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2DC9746C-8DAA-4231-8A40-23C6BCEF62EC>