From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32730 invoked by uid 1002); 11 Jan 2003 01:49:29 -0000 Mailing-List: contact gentoo-dev-help@gentoo.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@gentoo.org Received: (qmail 19627 invoked from network); 11 Jan 2003 01:49:29 -0000 Date: Fri, 10 Jan 2003 17:48:02 -0800 From: Joseph Carter To: William Kenworthy Cc: Kai =?iso-8859-1?Q?Gro=DFjohann?= , gentoo-dev List , gentoo-user List Message-ID: <20030111014801.GC3201@bluecherry.net> References: <33052.192.168.0.8.1041817268.squirrel@webmail.codewordt.co.uk> <200301060054.29991.absinthe@pobox.com> <84lm1s4omr.fsf@lucy.cs.uni-dortmund.de> <1042239936.31293.3.camel@rattus.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eHhjakXzOLJAF9wJ" Content-Disposition: inline In-Reply-To: <1042239936.31293.3.camel@rattus.localdomain> User-Agent: Mutt/1.4i X-Operating-System: Linux galen.bluecherry.net 2.4.19-gentoo-r10 X-No-Junk-Mail: Spam will solicit a hostile reaction, at the very least. Subject: Re: [gentoo-dev] Re: etc-update & ._cfg* files: major issue with gentoo? X-Archives-Salt: 952883fd-ea76-4989-a833-de8fdee89524 X-Archives-Hash: 0caca12589f8fc5bd860cab4e9e69570 --eHhjakXzOLJAF9wJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jan 11, 2003 at 07:05:36AM +0800, William Kenworthy wrote: > diffs from what? what happens if the user has made changes outside of > the way gentoo has configured the system? I found this was a major > disavantage of Mandrake, as it had to assume that the user didnt fiddle > with the files - if you configured it manually for whatever reason, the > whole mandrake configuration system ended up broken. man diff3 =3D) diff3 generates a merge diff for three versions of a file - the original, an updated file, and a second updated file (ie, made by a sysadmin), and a second version of an updated file (ie, made by Gentoo..) RCS and CVS depend heavily on this for conflict resolution. --=20 Joseph Carter Here we go again =20 <_Anarchy_> acf: maybe April 1 next year slashdot needs to run "Rob Malda accepts new job as head of Debian project" 8) --eHhjakXzOLJAF9wJ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) Comment: 1024D/20F62261F1857A3E79FC44F98FF7D7A3DCF9DAB3 iEYEARECAAYFAj4fd9EACgkQj/fXo9z52rMM7QCfQp6uS/Ux4wGStzoQj7esp1mo ri8AnROgYK1l9X+fb4VlFh3zDpB4DU6Y =/tl4 -----END PGP SIGNATURE----- --eHhjakXzOLJAF9wJ--