From owner-freebsd-hackers@FreeBSD.ORG Tue Feb 3 21:03:48 2009 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06EC21065672 for ; Tue, 3 Feb 2009 21:03:48 +0000 (UTC) (envelope-from tevans.uk@googlemail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.171]) by mx1.freebsd.org (Postfix) with ESMTP id 8499C8FC16 for ; Tue, 3 Feb 2009 21:03:47 +0000 (UTC) (envelope-from tevans.uk@googlemail.com) Received: by ug-out-1314.google.com with SMTP id j40so46345ugd.39 for ; Tue, 03 Feb 2009 13:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=z/gSS8As0uX/PXu0M/GK6OUg0fxxR1DknJGkimyRRCA=; b=Q6MMdZaJI9v1+sU5Mb6Q3FLcgdwWoZZE5nc4IZBuvVkP5wqXOryIA/kc8i3ixZJ8vp l5hdcal8FjC06sYPxqhwOE88oLwYTu7oBV002nrQ0zvJkpgSVMm8XXHs9QX62EdZvoUO FfafILOPW0K+ubzx5BNE+XezGmoPVuIY9C8nA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=sHNQiplR0qL192ATJUS2JW+ilxCY+qXSO0RYuEQHZdPwK6otQcJYmFowqClHloVdd/ SuByAA6GcuMSUKdVWF6dWcSxhCYOCCbq4cIhplbWGBJIhBIrkdItVqtvRg2EcHPIqtnP kqTkcPbYr+hVoOGhmw+onyEYHm6z0TiQ5OanM= Received: by 10.67.123.1 with SMTP id a1mr2627833ugn.42.1233693111366; Tue, 03 Feb 2009 12:31:51 -0800 (PST) Received: from ?192.168.1.66? (87-194-39-182.bethere.co.uk [87.194.39.182]) by mx.google.com with ESMTPS id h1sm3449694nfh.63.2009.02.03.12.31.50 (version=SSLv3 cipher=RC4-MD5); Tue, 03 Feb 2009 12:31:50 -0800 (PST) From: Tom Evans To: Chuck Robey In-Reply-To: <49889BD1.40107@telenix.org> References: <49889842.9050103@gmail.com> <49889BD1.40107@telenix.org> Content-Type: text/plain Date: Tue, 03 Feb 2009 20:31:33 +0000 Message-Id: <1233693093.82064.4.camel@jacob.nubtek.com> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: freebsd-hackers@freebsd.org, "Aryeh M. Friedman" Subject: Re: usinig cvs diff to make a patch X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2009 21:03:48 -0000 On Tue, 2009-02-03 at 14:32 -0500, Chuck Robey wrote: > Aryeh M. Friedman wrote: > > I use a local cvs repo and I have modified a port and which to submit an > > update for it how do I generate a patch file with cvs (cvs diff seems to > > give a unusable format)? > > _______________________________________________ > > freebsd-hackers@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/freebsd-hackers > > To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org" > > cvs diff -u gives the unified format (or cvs diff -c for context, get the > pattern?) Or, copying from the web page > http://www.eyrie.org/~eagle/notes/cvs/basic-usage.html, which shows how to use > the ~/.cvsrc file to make common cvs commands default the way you want them to, > you could put into that file the line "diff -u" so it always gives you the > unified diff format, which just happens to be the easiest for humans to read, > and the format specified in FreeBSD (hint, hint). When reading this, I was immediately reminded of this passage from development(7), describing how to set up a local cvs repository for src/ports...: ... you need to set up a ~/.cvsrc (/root/.cvsrc) file, as shown below, for proper cvs(1) operation. Using ~/.cvsrc to specify cvs(1) defaults is an excellent way to ``file and forget'', but you should never forget that you put them in there. # cvs -q diff -u update -Pd checkout -P Cheers Tom