From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Ole Laursen Newsgroups: gmane.emacs.help Subject: Re: How useful to run GDB and CVS from *WITHIN* Emacs? How helps? Date: 18 Feb 2003 20:35:41 +0100 Organization: TDC Internet Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: <87znotv0tu.fsf@bach.composers> References: <84k7g39gh3.fsf@lucy.is.informatik.uni-duisburg.de> <84of5eztc2.fsf@lucy.is.informatik.uni-duisburg.de> <87u1f679fq.fsf@bach.composers> <87u1f675dp.fsf@nodewarrior.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1045597447 10036 80.91.224.249 (18 Feb 2003 19:44:07 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Tue, 18 Feb 2003 19:44:07 +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 18lDes-0002bC-00 for ; Tue, 18 Feb 2003 20:44:02 +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 18lDcW-0002VK-01 for gnu-help-gnu-emacs@m.gmane.org; Tue, 18 Feb 2003 14:41:36 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!nntp.cs.ubc.ca!logbridge.uoregon.edu!news.tele.dk!news.tele.dk!small.news.tele.dk!not-for-mail Original-Newsgroups: gnu.emacs.help User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 Original-Lines: 24 Original-NNTP-Posting-Host: 131.165.63.132 Original-X-Trace: 1045596947 dread15.news.tele.dk 185 131.165.63.132 Original-X-Complaints-To: abuse@post.tele.dk Original-Xref: shelby.stanford.edu gnu.emacs.help:110349 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:6851 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:6851 Dan Debertin writes: > 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 :). I think you're right. I've read the documentation know. I'll try being more courageous next time I get a conflict, though I fear I will have forgotten the commands at that time. :-) -- Ole Laursen http://www.cs.auc.dk/~olau/