Re: mercurial user: how do you rebase or merge using emacs?

[Eli Zaretskii]

> From: Uwe Brauer <oub@mat.ucm.es>
> 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.