[Bug 5219] New: rebase fails when run from hidden commit
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Apr 22 19:53:03 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5219
Bug ID: 5219
Summary: rebase fails when run from hidden commit
Product: Mercurial
Version: 3.8-rc
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: rebase
Assignee: bugzilla at selenic.com
Reporter: martinvonz at google.com
CC: mercurial-devel at selenic.com
The below creates a few changes, checks out a hidden commit, then rebases some
other commit onto yet another commit. The output from rebase is this:
rebasing 2:2f0b498f8635 "2"
abort: hidden revision '3'!
(use --hidden to access hidden revisions)
The rebase seems to mostly succeed, but fails when it tries to move back to the
hidden commit. The new commit is created, but the obsmarker is not, so there
are two (unobsolete) commits with description "2" after the failed rebase.
rm -rf repo
hg init repo
cd repo
echo a > f0
hg ci -Aqm 0
echo a > f1
hg ci -Aqm 1
echo a > f2
hg ci -Aqm 2
hg co .^
hg amend -m 3
hg amend -m 4
hg --hidden co 3
hg log -G
hg rebase -d 4 -r 2
hg log -G
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list