[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: mercurial user: how do you rebase or merge using emacs?
From: |
Uwe Brauer |
Subject: |
Re: mercurial user: how do you rebase or merge using emacs? |
Date: |
Tue, 06 Sep 2022 22:30:04 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
> 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
Debugger entered--Lisp error: (error #("Failed (status 255): hg --config
ui.report_untrust..." 65 70 (fontified t face log-edit-summary
jit-lock-defer-multiline t)))
signal(error (#("Failed (status 255): hg --config ui.report_untrust..." 65 70
(fontified t face log-edit-summary jit-lock-defer-multiline t))))
error("Failed (%s): %s" "status 255" #("hg --config ui.report_untrusted=0
commit -m Merge\n..." 44 49 (jit-lock-defer-multiline t face log-edit-summary
fontified t)))
vc-do-command("*vc*" 0 "hg" ("/home/oub/HGTest/Branches/Named/test.org")
"--config" "ui.report_untrusted=0" "commit" "-m" #("Merge\n\n" 0 5
(jit-lock-defer-multiline t face log-edit-summary fontified t)))
apply(vc-do-command "*vc*" 0 "hg"
("/home/oub/HGTest/Branches/Named/test.org") ("--config"
"ui.report_untrusted=0" "commit" "-m" #("Merge\n\n" 0 5
(jit-lock-defer-multiline t face log-edit-summary fontified t))))
vc-hg-command(nil 0 ("/home/oub/HGTest/Branches/Named/test.org") "commit"
"-m" #("Merge\n\n" 0 5 (jit-lock-defer-multiline t face log-edit-summary
fontified t)))
apply(vc-hg-command nil 0 ("/home/oub/HGTest/Branches/Named/test.org")
("commit" "-m" #("Merge\n\n" 0 5 (jit-lock-defer-multiline t face
log-edit-summary fontified t))))
vc-hg-checkin(("/home/oub/HGTest/Branches/Named/test.org") #("Summary:
Merge\n" 0 7 (jit-lock-defer-multiline t face log-edit-header fontified t
pabbrev-added t) 7 8 (jit-lock-defer-multiline t face log-edit-header fontified
t) 8 9 (jit-lock-defer-multiline t fontified t) 9 14 (jit-lock-defer-multiline
t face log-edit-summary fontified t) 14 15 (fontified t)) nil)
apply(vc-hg-checkin (("/home/oub/HGTest/Branches/Named/test.org") #("Summary:
Merge\n" 0 7 (jit-lock-defer-multiline t face log-edit-header fontified t
pabbrev-added t) 7 8 (jit-lock-defer-multiline t face log-edit-header fontified
t) 8 9 (jit-lock-defer-multiline t fontified t) 9 14 (jit-lock-defer-multiline
t face log-edit-summary fontified t) 14 15 (fontified t)) nil))
vc-call-backend(Hg checkin ("/home/oub/HGTest/Branches/Named/test.org")
#("Summary: Merge\n" 0 7 (jit-lock-defer-multiline t face log-edit-header
fontified t pabbrev-added t) 7 8 (jit-lock-defer-multiline t face
log-edit-header fontified t) 8 9 (jit-lock-defer-multiline t fontified t) 9 14
(jit-lock-defer-multiline t face log-edit-summary fontified t) 14 15 (fontified
t)) nil)
#f(compiled-function (files comment) #<bytecode
0x197e0f6bebe04cfe>)(("/home/oub/HGTest/Branches/Named/test.org") #("Summary:
Merge\n" 0 7 (jit-lock-defer-multiline t face log-edit-header fontified t
pabbrev-added t) 7 8 (jit-lock-defer-multiline t face log-edit-header fontified
t) 8 9 (jit-lock-defer-multiline t fontified t) 9 14 (jit-lock-defer-multiline
t face log-edit-summary fontified t) 14 15 (fontified t)))
vc-finish-logentry()
funcall-interactively(vc-finish-logentry)
call-interactively(vc-finish-logentry)
log-edit-done()
funcall-interactively(log-edit-done)
call-interactively(log-edit-done nil nil)
command-execute(log-edit-done)
So I am confused
--
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.
smime.p7s
Description: S/MIME cryptographic signature
Re: mercurial user: how do you rebase or merge using emacs?, Marcin Borkowski, 2022/09/07