From owner-freebsd-questions@FreeBSD.ORG Wed Jan 2 16:41:54 2008 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61CD316A418 for ; Wed, 2 Jan 2008 16:41:54 +0000 (UTC) (envelope-from beech@freebsd.org) Received: from freebsd.alaskaparadise.com (freebsd.alaskaparadise.com [208.79.80.117]) by mx1.freebsd.org (Postfix) with ESMTP id 36B5C13C455 for ; Wed, 2 Jan 2008 16:41:54 +0000 (UTC) (envelope-from beech@freebsd.org) Received: from 137-42-178-69.gci.net (137-42-178-69.gci.net [69.178.42.137]) by freebsd.alaskaparadise.com (Postfix) with ESMTP id 3F17E23835DC; Wed, 2 Jan 2008 16:41:53 +0000 (UTC) From: Beech Rintoul To: freebsd-questions@freebsd.org Date: Wed, 2 Jan 2008 07:41:40 -0900 User-Agent: KMail/1.9.7 References: <27dbfc8c0801020815h942fc0cmf264ceabf0b02d46@mail.gmail.com> In-Reply-To: <27dbfc8c0801020815h942fc0cmf264ceabf0b02d46@mail.gmail.com> X-Face: jC2w\k*Q1\0DA2Q0Eh&BrP/Rt2M,^2O#R07VoT98m*>miQF9%Bi9vy`F6cPjwEe?m,)=?utf-8?q?2=0A=09X=3FM=5C=3AOE9QgZ?="xT3/n3,3MJ7N=Cfkmi%f(w^~X"SUxn>; 27NO; C+)g[7J`$G*SN>{<=?utf-8?q?O=3Bg7=7C=0A=09o=7D=265A=5D4?=@7D`=Eb@Zs1Ln814?]|k@'bG=.Ca"[|8+_.OsNAo8!#?4u MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200801020741.47096.beech@freebsd.org> Cc: Valerio Daelli Subject: Re: Question about a patch X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Beech Rintoul List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jan 2008 16:41:54 -0000 On Wednesday 02 January 2008, Valerio Daelli said: > Hi > > I am about to send a patch about a port. I would like to move a > file of the port, located in the > 'files/' directory. Basically the file now is called netdisco.sh.in > and I would like to call it > netdisco.in. > If I use a normal 'diff -ruN' command to generate the patch, after > I apply the patch > the new file is created but the old file (netdisco.sh.in) is still > there, with zero size. > I wonder if I should generate a shar archive for this port instead > of a patch. Sorry if this question is so simple. > Bye > > Valerio Daelli That's normal. A unified diff is the preferred way. Whoever commits it will remove the file. You might make mention of the file in the comments just to be nice :-) Beech -- --------------------------------------------------------------------------------------- Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org /"\ ASCII Ribbon Campaign | FreeBSD Since 4.x \ / - NO HTML/RTF in e-mail | http://www.freebsd.org X - NO Word docs in e-mail | Latest Release: / \ - http://www.FreeBSD.org/releases/6.2R/announce.html ---------------------------------------------------------------------------------------