This revision was automatically updated to reflect the committed changes.
Closed by commit rHG19f495fef0a3: rebase: change "result would have 3 parent"
error message (BC) (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D342?vs=892=905
quark updated this revision to Diff 892.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D342?vs=831=892
REVISION DETAIL
https://phab.mercurial-scm.org/D342
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-brute-force.t
tests/test-rebase-obsolete.t
quark updated this revision to Diff 831.
quark edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D342?vs=769=831
REVISION DETAIL
https://phab.mercurial-scm.org/D342
AFFECTED FILES
hgext/rebase.py
quark added a comment.
I guess the old error message was intended for the below case:
$ hg debugdrawdag <<'EOF'
> H
> /|
> D F
> | |\
> C E G
> \|/
> B Z
> |/
> A
> EOF
$ hg rebase -d Z -r 'C+E+G+H'
Removing D, having C
quark planned changes to this revision.
quark added inline comments.
INLINE COMMENTS
> martinvonz wrote in rebase.py:1066
> I feel like "Cannot rebase merge commit %d without rebasing at least one its
> parents" would be more specific and still be accurate.
>
> It would be nice if we could
martinvonz added inline comments.
INLINE COMMENTS
> rebase.py:1066
> if set(newps) == set(oldps) and dest not in newps:
> -# The error message is for compatibility. It's a bit misleading since
> -# rebase is not supposed to add new parents.
> -raise
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The old error message "cannot use revision REV as base, result would have 3
parents" is confusing - why use REV as base? why add a new parent?.
This patch
