From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Uwe Brauer Newsgroups: gmane.emacs.help Subject: mercurial user: how do you rebase or merge using emacs? Date: Tue, 06 Sep 2022 18:37:33 +0200 Message-ID: <874jxke9wy.fsf@mat.ucm.es> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13946"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) To: help-gnu-emacs@gnu.org Cancel-Lock: sha1:j4HgsJlEEmXnYWVKfJW9KB6U98Y= Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 06 18:42:37 2022 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oVbem-0003WF-HI for geh-help-gnu-emacs@m.gmane-mx.org; Tue, 06 Sep 2022 18:42:36 +0200 Original-Received: from localhost ([::1]:60810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVbel-0002wc-ET for geh-help-gnu-emacs@m.gmane-mx.org; Tue, 06 Sep 2022 12:42:35 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVba3-0006AK-Sl for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 12:37:44 -0400 Original-Received: from ciao.gmane.io ([116.202.254.214]:50344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVba2-0001HF-8c for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 12:37:43 -0400 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1oVbZy-0007aE-3N for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 18:37:38 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: help-gnu-emacs@gnu.org Mail-Copies-To: never Received-SPF: pass client-ip=116.202.254.214; envelope-from=geh-help-gnu-emacs@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.io gmane.emacs.help:139284 Archived-At: Hi 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 am not sure how many emacs users are on this list, but if they are I'd love to hear about their workflow. I also tried monky a bit, but it is not very intuitive at least not for me. Uwe Brauer -- I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the ban of Russia from SWIFT. I support the EU membership of the Ukraine. -- I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the ban of Russia from SWIFT. I support the EU membership of the Ukraine.