From owner-freebsd-stable@FreeBSD.ORG Thu Mar 12 10:45:39 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B8721065673 for ; Thu, 12 Mar 2009 10:45:39 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.freebsd.org (Postfix) with ESMTP id 9EC548FC0C for ; Thu, 12 Mar 2009 10:45:38 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.localnet (ppp121-45-189-13.lns11.adl2.internode.on.net [121.45.189.13]) (authenticated bits=0) by cain.gsoft.com.au (8.13.8/8.13.8) with ESMTP id n2CAjGNW013521 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 12 Mar 2009 21:15:16 +1030 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: freebsd-stable@freebsd.org Date: Thu, 12 Mar 2009 21:11:53 +1030 User-Agent: KMail/1.10.4 (Linux/2.6.27-11-generic; KDE/4.1.4; i686; ; ) References: <49B8AB66.9080408@bsd.ee> <49B8BA35.802@bsd.ee> <49B8BE29.3050604@FreeBSD.org> In-Reply-To: <49B8BE29.3050604@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2368066.RJjxxFdR22"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200903122112.31928.doconnor@gsoft.com.au> X-Spam-Score: -2.212 () BAYES_00,RDNS_DYNAMIC X-Scanned-By: MIMEDefang 2.63 on 203.31.81.10 Cc: Andrei Kolu , Doug Barton Subject: Re: mergemaster annoyance or not? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 10:45:39 -0000 --nextPart2368066.RJjxxFdR22 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 12 March 2009 18:17:53 Doug Barton wrote: > > I hope this issue will be resolved. > > What you're seeing is a mildly annoying side effect of how CVS works. > There is nothing to resolve. I wouldn't classify it as mildly annoying that you need to manually interve= ne=20 in every single file.. Eugene's idea for the default diff options makes a lot of sense to me - I=20 don't think any "normal" user gives a hoot about the CVS Id of a file. (even devs!) =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart2368066.RJjxxFdR22 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iD8DBQBJuOby5ZPcIHs/zowRAgwKAJ4xXdiNJR/wquQW21URVsmcOp+TGgCgoPKu Xg4qs0noeZmL64KMFt4Kbdk= =iA3l -----END PGP SIGNATURE----- --nextPart2368066.RJjxxFdR22--