From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1FuvMK-0005uz-5P for garchives@archives.gentoo.org; Mon, 26 Jun 2006 17:58:52 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.7/8.13.6) with SMTP id k5QHreT8008794; Mon, 26 Jun 2006 17:53:40 GMT Received: from hetzner.email-server.info (new.email-server.info [213.133.109.44]) by robin.gentoo.org (8.13.7/8.13.6) with ESMTP id k5QHXjJU016223 for ; Mon, 26 Jun 2006 17:33:46 GMT Received: by hetzner.email-server.info (Postfix, from userid 1001) id 89E24311B7; Mon, 26 Jun 2006 19:35:04 +0200 (CEST) X-Spam-Tests: AWL=0.070,BAYES_00=-2.599 X-Spam-Contact: Contact Address X-Spam-Checker-Version: SpamAssassin 3.1.3-gr0 (2006-06-01) on hetzner.email-server.info X-Spam-Relays: Trusted=, Untrusted=[ ip=88.130.78.103 rdns=mue-88-130-78-103.dsl.tropolys.de helo=!192.168.1.244! by=hetzner.email-server.info ident= envfrom= intl=0 id=C1F1F311B4 auth= ] X-Spam-Level: X-Spam-Bayes: Score=0.0000, Tokens=Tokens: new, 16; hammy, 93; neutral, 47; spammy, 3., Hammy=0.000-+--diff, 0.000-+--H*M:mid, 0.000-+--H*r:sk:mue-88-, 0.000-+--H*RU:sk:mue-88-, 0.000-+--H*p:U*listen, Spammy=0.914-+--age, 0.898-+--H*r:sk:hetzner, 0.897-2--revert X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.1.3-gr0 X-Spam-Externals: DCC Brand "_DCCB_", Result _DCCR_ - Pyzor=_PYZOR_, RBL [213.133.109.44] [10 new.email-server.info.] Received: from [192.168.1.244] (mue-88-130-78-103.dsl.tropolys.de [88.130.78.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by hetzner.email-server.info (Postfix) with ESMTP id C1F1F311B4 for ; Mon, 26 Jun 2006 19:34:52 +0200 (CEST) Message-ID: <44A01A6F.7090205@mid.email-server.info> Date: Mon, 26 Jun 2006 19:33:35 +0200 From: Alexander Skwar User-Agent: Thunderbird 1.5.0.4 (X11/20060610) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@gentoo.org Reply-to: gentoo-user@lists.gentoo.org MIME-Version: 1.0 To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] etc-update References: <449FD4B2.2080408@verizon.net> <200606261453.45927.bo.andresen@zlin.dk> <449FEE1D.5050406@mid.message-center.info> <200606261638.33864.bo.andresen@zlin.dk> In-Reply-To: <200606261638.33864.bo.andresen@zlin.dk> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by robin.gentoo.org id k5QHreTO008794 X-Archives-Salt: fccf1942-65ab-412c-8695-e7511ea0f34f X-Archives-Hash: af1be132c6b9cb4533fee877b4e9f590 Bo =D8rsted Andresen wrote: > On Monday 26 June 2006 16:24, Alexander Skwar wrote: >> Hm. Why? What's bad about etc-update? >=20 > I dislike using diff. Hm. dispatch-conf uses diff as well and etc-update can be configured to use a different program. > On my desktop I use meld (all graphical) and on my=20 > server I use vimdiff. dispatch-update takes care of trivial merges So does etc-update. > (changes=20 > in cvs headers or commentaries) Ah, okay, that's a bit better. As far as I know, etc-update only automerges changes in whitespace. > and changes in files that I have never edited=20 > automatically. That's nice. > dispatch-conf supports automatic use of rcs (revision control=20 > system) so I can revert my configs if I need to.. That's also nice. Alexander Skwar --=20 Old age is the most unexpected of things that can happen to a man. -- Trotsky --=20 gentoo-user@gentoo.org mailing list