From owner-freebsd-questions Thu Dec 3 02:24:48 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA25555 for freebsd-questions-outgoing; Thu, 3 Dec 1998 02:24:48 -0800 (PST) (envelope-from owner-freebsd-questions@FreeBSD.ORG) Received: from alcatel.fr (news.alcatel.fr [194.133.58.131]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA25550 for ; Thu, 3 Dec 1998 02:24:46 -0800 (PST) (envelope-from Thierry.Herbelot@alcatel.fr) From: Thierry.Herbelot@alcatel.fr Received: from alcatel.fr (gatekeeper-ssn.alcatel.fr [155.132.180.244]) by mailgate.alcatel.fr (ALCANET/SMTP) with ESMTP id MAA08049; Thu, 3 Dec 1998 12:22:37 +0100 Received: from lune.telspace.alcatel.fr (lune.telspace.alcatel.fr [155.132.144.65]) by aifhs2.alcatel.fr (ALCANET/SMTP2) with ESMTP id LAA05779; Thu, 3 Dec 1998 11:21:52 +0100 (MET) Received: from telss1 (telss1.telspace.alcatel.fr [155.132.51.4]) by lune.telspace.alcatel.fr (8.9.1a/8.9.1) with SMTP id LAA20653; Thu, 3 Dec 1998 11:08:27 +0100 (MET) Received: from telspace.alcatel.fr by telss1 (4.1/SMI-4.1) id AA14416; Thu, 3 Dec 98 11:12:42 +0100 Received: from localhost by telspace.alcatel.fr with SMTP (1.40.112.12/16.2) id AA288719507; Thu, 3 Dec 1998 11:05:07 +0100 X-Openmail-Hops: 1 Date: Thu, 3 Dec 98 10:55:24 +0100 Message-Id: In-Reply-To: <3666C7C3.3C272705@www.transfar.com> Subject: Re: How to use FreeBSD patch? Mime-Version: 1.0 To: phj@www.transfar.com Cc: freebsd-questions@FreeBSD.ORG Content-Type: text/plain; charset=US-ASCII; name="Re:" Content-Disposition: inline; filename="Re:" Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Ok, then 1st answer : man patch 2nd answer : patch < patchfile (or patch -p < patchfile : this is how I patched XFree86 3.3.2 to get additions from Nvidia) I'm not expert with patch : read the man page. TfH > TfH,Thank you for your help . > > Maybe I don't tell my question clearly. I use CVS to manage some > programs, > and I have a patch which created from command > cvs diff -r 1.1.1 -r 1.2.4 foo.c > some_patch > 1.2.4 is a branch version , > now, my question is how can I apply this patch to trunk version 1.3. > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message