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: Wed, 07 Sep 2022 05:29:43 +0300 Message-ID: <83h71jj4rs.fsf@gnu.org> References: <874jxke9wy.fsf@mat.ucm.es> <83mtbcigco.fsf@gnu.org> <87ilm0z1o3.fsf@mat.ucm.es> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28639"; 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 Wed Sep 07 04:31:08 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 1oVkqJ-0007JV-00 for geh-help-gnu-emacs@m.gmane-mx.org; Wed, 07 Sep 2022 04:31:07 +0200 Original-Received: from localhost ([::1]:34452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVkqH-0001RD-Iz for geh-help-gnu-emacs@m.gmane-mx.org; Tue, 06 Sep 2022 22:31:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVkpF-0001R4-NJ for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 22:30:01 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVkpF-0006d0-E0 for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 22:30:01 -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=JGyI35U6Jhqcg4j0dPQM3BJIJKfdzTgpCH4jlcRld0A=; b=at7oNnY4rGz+ vYFOsfW2Gw8yHWUpI342E9jsHED0jo12Jxi0hZkXNffb2CHATJnQ078FlV+owb3ghlWwEO3/QpPnv LKOTEWIYKQ3JN5hXEkNyBAe8gnv2z0gYjtgfcyMEGnvbh25h+FG8YiqfxV0MSeZmTyA2c/c3wVrvn 5ORoMXWXluSY7T42HBn1xfoqMXILzPgSGiaT3GbuHqjF52Ftw9AwtS06/6W6WoTnLH88FhMHLhHQq G+Z7oOecmlYD6qi6YfWgei3Pzx/r6gWi+5rHgpLhkcLoiT1BjaMr0w/91usv5kpU9I6oXnp7hlYsi vnYSSzjN5Z5pkaQc9fzmrQ==; Original-Received: from [87.69.77.57] (port=2793 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 1oVkpE-0004FZ-TM for help-gnu-emacs@gnu.org; Tue, 06 Sep 2022 22:30:01 -0400 In-Reply-To: <87ilm0z1o3.fsf@mat.ucm.es> (message from Uwe Brauer on Tue, 06 Sep 2022 22:30:04 +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:139290 Archived-At: > From: Uwe Brauer > Date: Tue, 06 Sep 2022 22:30:04 +0200 > > > 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). > > Well yes and no (at least for hg). > Steps: > > 1. vc-merge > > 2. I am asked for a version to merge. > > 3. I obtain > Running "merge 5"... > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > (branch merge, don't forget to commit) > > (5 because hg has also local rev numbers beside HASHES) > > But the commit that is needed, cannot be done my vc, at least I am unable, vc-dir gives. > > VC backend : Hg > Working dir: ~/HGTest/Branches/Named/ > Parent : 6:d1ccbfd46e4e tip > : Seven > Parent : 5:1cd3b49213c7 > : Six > Branch : default > Commit : 1 modified (merge) > Update : (current) > Phases : 7 draft > > ./ > edited test.org > > But when I select, as usual the edit file and run vc-next-action I obtain > > > Running "commit -m Merge > > test.org"... > abort: cannot partially commit a merge (do not specify files or patterns) > > Well so I repeat the operation without selecting a file, I obtain This could be some cockpit error, but in any case, suggest to report the recipe with the problem to the bug tracker, and then the VC experts will figure out what's wrong.