Date: Thu, 12 Mar 2009 21:11:53 +1030 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: freebsd-stable@freebsd.org Cc: Andrei Kolu <antik@bsd.ee>, Doug Barton <dougb@freebsd.org> Subject: Re: mergemaster annoyance or not? Message-ID: <200903122112.31928.doconnor@gsoft.com.au> In-Reply-To: <49B8BE29.3050604@FreeBSD.org> References: <49B8AB66.9080408@bsd.ee> <49B8BA35.802@bsd.ee> <49B8BE29.3050604@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903122112.31928.doconnor>