all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dan Debertin <airboss@nodewarrior.org>
Subject: Re: How useful to run GDB and CVS from *WITHIN* Emacs? How helps?
Date: 14 Feb 2003 18:29:54 -0600	[thread overview]
Message-ID: <87u1f675dp.fsf@nodewarrior.org> (raw)
In-Reply-To: 87u1f679fq.fsf@bach.composers

Ole Laursen <olau@hardworking.dk> 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      | 

  reply	other threads:[~2003-02-15  0:29 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-02-13  1:16 How useful to run GDB and CVS from *WITHIN* Emacs? How helps? Christian Seberino
2003-02-13  3:38 ` Edgar Antonio Luna Díaz
2003-02-13  3:52 ` Alan Shutko
2003-02-13 12:35 ` Christopher J. White
2003-02-13 21:30 ` kgold
2003-02-13 23:01   ` Kevin Rodgers
2003-02-14  9:10   ` gebser
2003-02-14 12:47     ` Kai Großjohann
2003-02-14 14:03       ` gebser
     [not found]       ` <mailman.1979.1045231509.21513.help-gnu-emacs@gnu.org>
2003-02-14 17:05         ` Kai Großjohann
2003-02-14 17:46           ` Stefan Monnier <foo@acm.com>
2003-02-14 23:02           ` Ole Laursen
2003-02-15  0:29             ` Dan Debertin [this message]
2003-02-18 19:35               ` Ole Laursen
2003-02-15 10:20             ` Kai Großjohann
2003-02-16 22:33               ` Stefan Monnier <foo@acm.com>
2003-02-18 19:28                 ` Ole Laursen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87u1f675dp.fsf@nodewarrior.org \
    --to=airboss@nodewarrior.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.