From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9739 invoked by uid 1002); 6 Jan 2003 15:21:28 -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 21942 invoked from network); 6 Jan 2003 15:21:27 -0000 Date: Mon, 6 Jan 2003 07:20:37 -0800 From: Joseph Carter To: Kai =?iso-8859-1?Q?Gro=DFjohann?= Cc: gentoo-dev@gentoo.org, gentoo-user@gentoo.org Message-ID: <20030106152037.GC3991@bluecherry.net> References: <33052.192.168.0.8.1041817268.squirrel@webmail.codewordt.co.uk> <841y3qloyq.fsf@lucy.cs.uni-dortmund.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pAwQNkOnpTn9IO2O" Content-Disposition: inline In-Reply-To: <841y3qloyq.fsf@lucy.cs.uni-dortmund.de> 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: 8ff63e5b-3803-49c2-90f8-40fce6a85bbf X-Archives-Hash: 4f5929fb8bb5bee7a8a94f754d6c9b7d --pAwQNkOnpTn9IO2O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 06, 2003 at 08:25:17AM +0100, Kai Gro?johann wrote: > But even in the cfengine case, it would be useful to stash the > original versions of config files somewhere such that a diff between > A and C could be requested. >=20 > What do people think? I think you just described exactly what's needed for the diff3 merge I commented on. =3D) --=20 Joseph Carter Crazy in the coconut =20 cat /dev/random | perl ? doogie: it is also a valid sendmail.cf :) * shaleh wants to try it but is afraid --pAwQNkOnpTn9IO2O Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) Comment: 1024D/DCF9DAB3 20F6 2261 F185 7A3E 79FC 44F9 8FF7 D7A3 DCF9 DAB3 iEYEARECAAYFAj4ZnsUACgkQj/fXo9z52rMW/ACeI6GStM9x05KXkoZmURTL91Vv YocAoK5HJLZeNSrY+g5nsi56up4iWOUq =45dx -----END PGP SIGNATURE----- --pAwQNkOnpTn9IO2O--