From gentoo-dev  Sat Jan 11 01:48:02 2003
From: Joseph Carter <knghtbrd () efn ! org>
Date: Sat, 11 Jan 2003 01:48:02 +0000
To: gentoo-dev
Subject: Re: [gentoo-dev] Re: etc-update & ._cfg* files: major issue with gentoo?
X-MARC-Message: https://marc.info/?l=gentoo-dev&m=104224960303448
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--eHhjakXzOLJAF9wJ"

--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 <knghtbrd@efn.org>                          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--