From: Eli Zaretskii <eliz@gnu.org>
To: help-gnu-emacs@gnu.org
Subject: Re: mercurial user: how do you rebase or merge using emacs?
Date: Tue, 06 Sep 2022 20:04:55 +0300 [thread overview]
Message-ID: <83mtbcigco.fsf@gnu.org> (raw)
In-Reply-To: <874jxke9wy.fsf@mat.ucm.es> (message from Uwe Brauer on Tue, 06 Sep 2022 18:37:33 +0200)
> From: Uwe Brauer <oub@mat.ucm.es>
> Date: Tue, 06 Sep 2022 18:37:33 +0200
>
> I use either vc-dir or the ahg package. Both are nice for showing the
> graph and commiting, even for interactive commiting, which I do a lot
> lately.
>
> However, merging and rebasing I have to do via the command line and then
> although emacs pops up, emacs is just in text mode but not in
> vc-hg-log-edit-mode so I don't have the usual emacs support.
I don't thin VC supports rebasing. But merging is supported: see
vc-merge (a.k.a. "C-x v m" in a vc-dir buffer).
next prev parent reply other threads:[~2022-09-06 17:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 16:37 mercurial user: how do you rebase or merge using emacs? Uwe Brauer
2022-09-06 17:04 ` Eli Zaretskii [this message]
2022-09-06 20:30 ` Uwe Brauer
2022-09-07 2:29 ` Eli Zaretskii
2022-09-07 6:44 ` Uwe Brauer
2022-09-08 16:24 ` [culprit found, it is the cursor] (was: mercurial user: how do you rebase or merge using emacs?) Uwe Brauer
2022-09-07 15:24 ` mercurial user: how do you rebase or merge using emacs? Marcin Borkowski
2022-09-08 6:34 ` Uwe Brauer
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=83mtbcigco.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=help-gnu-emacs@gnu.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.