From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Dan Debertin Newsgroups: gmane.emacs.help Subject: Re: How useful to run GDB and CVS from *WITHIN* Emacs? How helps? Date: 14 Feb 2003 18:29:54 -0600 Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: <87u1f675dp.fsf@nodewarrior.org> References: <84k7g39gh3.fsf@lucy.is.informatik.uni-duisburg.de> <84of5eztc2.fsf@lucy.is.informatik.uni-duisburg.de> <87u1f679fq.fsf@bach.composers> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1045269209 4037 80.91.224.249 (15 Feb 2003 00:33:29 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sat, 15 Feb 2003 00:33:29 +0000 (UTC) Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18jqGl-00012r-00 for ; Sat, 15 Feb 2003 01:33:27 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18jqIr-0007mD-05 for gnu-help-gnu-emacs@m.gmane.org; Fri, 14 Feb 2003 19:35:38 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!news-out.visi.com!hermes.visi.com!gemini.bitstream.net.POSTED!not-for-mail Original-Newsgroups: gnu.emacs.help User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 Original-Lines: 21 Original-NNTP-Posting-Host: ce94a237.news.bitstream.net Original-X-Trace: 1045269098 gemini.bitstream.net 22477 216.243.168.26 Original-X-Complaints-To: abuse@bitstream.net Original-Xref: shelby.stanford.edu gnu.emacs.help:110223 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:6725 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:6725 Ole Laursen writes: > One important thing to note about the CVS features in Emacs is that if > it ever tells you that conflicts have been detected and asks whether > you want to correct them, better answer no. Else you end up in a weird > Ediff mode with three windows and an extra frame, and no clue of how > to proceed. :-) I don't use Emacs for CVS, but by your description I would say that's an emerge session (C-h i m emacs RET m emerge RET). Emerge is IMO the perfect tool for resolving conflicts between versions. Try it; you might like it :). Dan -- /^Dan Debertin$/ | airboss@nodewarrior.org | www.nodewarrior.org |