From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.help Subject: Re: mercurial user: how do you rebase or merge using emacs? Date: Tue, 06 Sep 2022 20:04:55 +0300 Message-ID: <83mtbcigco.fsf@gnu.org> References: <874jxke9wy.fsf@mat.ucm.es> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23380"; mail-complaints-to="usenet@ciao.gmane.io" To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 06 19:06:59 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 1oVc2N-0005qV-6C for geh-help-gnu-emacs@m.gmane-mx.org; Tue, 06 Sep 2022 19:06:59 +0200 Original-Received: from localhost ([::1]:46194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVc2M-00088z-6M for geh-help-gnu-emacs@m.gmane-mx.org; Tue, 06 Sep 2022 13:06:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVc1B-00087D-9T for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 13:05:45 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:41374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVc19-0005vS-P9 for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 13:05:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=tdYCO57RtVwYu+k2rdaZiPa6GOcgHEbQ1NJ5V7tf5sk=; b=q6PYVTB6SzS0 4m5jqNMMaZPAYS9R8ym1Ie9MjhPMNd0Zlk8JLBm3+0rSVYyC23etC6k95p9f6c2mFXIH4nZVy2hwB Q08SDvsFtj+aRWpiumLccgLbkhBEFopavq/VtR2b2P38fmKBpT1zw5Eg0H88HVGIABe/w5Uo/ObEa 2WNctRSzR2C9j6V04xQjLDRZ9gQQ58cyarCwT3CdQmX+l1ojsPRvS5aTtMzdelGI1i/IN3Y+dZS97 ZbOLs3MjlMn5l17WWevnOWcosQ17cirT/pypbXA0s1E7zz5GM7Xa7f6sCWWDGzRR5tk3Sebn6sDAe 8XiidDnhbXW/++jDBFfCBQ==; Original-Received: from [87.69.77.57] (port=3454 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVc0i-0008Hs-O3 for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 13:05:42 -0400 In-Reply-To: <874jxke9wy.fsf@mat.ucm.es> (message from Uwe Brauer on Tue, 06 Sep 2022 18:37:33 +0200) 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:139285 Archived-At: > From: Uwe Brauer > 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).