From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NjcpT-0004N4-S1 for garchives@archives.gentoo.org; Mon, 22 Feb 2010 18:16:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EC11E0EAC for ; Mon, 22 Feb 2010 18:16:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D8473E09F1 for ; Mon, 22 Feb 2010 17:33:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 7B33C1B4061 for ; Mon, 22 Feb 2010 17:33:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at gentoo.org X-Spam-Score: -3.38 X-Spam-Level: X-Spam-Status: No, score=-3.38 required=5.5 tests=[AWL=-0.781, BAYES_00=-2.599] Received: from smtp.gentoo.org ([127.0.0.1]) by localhost (smtp.gentoo.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z8ARt3Xfiowe for ; Mon, 22 Feb 2010 17:33:40 +0000 (UTC) Received: from lo.gmane.org (lo.gmane.org [80.91.229.12]) by smtp.gentoo.org (Postfix) with ESMTP id A1FA01B401F for ; Mon, 22 Feb 2010 17:33:37 +0000 (UTC) Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NjbnH-0004OQ-PU for gentoo-user@gentoo.org; Mon, 22 Feb 2010 18:10:03 +0100 Received: from c-98-215-178-110.hsd1.in.comcast.net ([98.215.178.110]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 22 Feb 2010 18:10:03 +0100 Received: from reader by c-98-215-178-110.hsd1.in.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 22 Feb 2010 18:10:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: gentoo-user@lists.gentoo.org From: Harry Putnam Subject: [gentoo-user] Re: How should I clean up my broken system? Date: Mon, 22 Feb 2010 11:06:39 -0600 Organization: Still searching... Message-ID: <87ljelkxnk.fsf@newsguy.com> References: <20100212195529.GD1560@muc.de> <1266721977.3445.146.camel@localhost> <3ac129341002220329s37ee383akec3c559a9de7b0e6@mail.gmail.com> <201002221456.45804.volkerarmin@googlemail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: c-98-215-178-110.hsd1.in.comcast.net User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.1 (gnu/linux) Cancel-Lock: sha1:qXnqkuhyCoTdzFgEMZopXB2RHQQ= X-Archives-Salt: bd71330f-b522-4090-ad30-28f1e5cf0e7e X-Archives-Hash: 1c722013ced48544ce9239f7e2b4c566 Volker Armin Hemmann writes: > well, cfg-update keeps a backup. It detects manual edits and try to > resolve conflicts resulting from that automatically. Which works > surprisingly well. If Volker gave me that same advice long ago, I've used cfg-update ever since. Its capable of dispatching meaningless file updates in the blink of an eye, and offers several well known methods for resolving those that need it. I personally use vimdiff with it, but there are several other options. Its just a good solid tool.