[Bug 3997] New: Unabortable rebase if first rebased commit is a noop
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Tue Jul 23 14:59:50 CDT 2013
http://bz.selenic.com/show_bug.cgi?id=3997
Priority: normal
Bug ID: 3997
CC: mercurial-devel at selenic.com
Assignee: bugzilla at selenic.com
Summary: Unabortable rebase if first rebased commit is a noop
Severity: bug
Classification: Unclassified
OS: Linux
Reporter: durham at fb.com
Hardware: PC
Status: UNCONFIRMED
Version: 2.6.3
Component: rebase
Product: Mercurial
When rebasing two commits, A and B, if A ends up being a noop (because the
change already exists on the destination branch) and B encounters a conflict,
the resulting rebase state is not abortable if the destination was phase=public
hg init foo
cd foo
hg book master
touch a && hg add a && hg commit -m a
hg book foo
echo x > a && hg commit -m x
echo y > b && hg add b && hg commit -m y
hg up master
echo x > a
echo z > b && hg add b && hg commit -m z
hg phase -p -r master
hg rebase -d master -b foo
hg rebase --abort
Output:
abort: can't abort rebase due to immutable changesets 396e50970b78
(see hg help phases for details)
This can also happen when using --collapse and a conflict happens, but I don't
have repro steps for it.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list