Bug #509
merge from open branch into a now-closed branch is not displayed
| Status: | New | Start date: | 2012-08-10 | |
|---|---|---|---|---|
| Priority: | Normal | Due date: | ||
| Assignee: |  Chris Cannam | % Done: | 0% | |
| Category: | - | |||
| Target version: | - |
Description
A branch that has been merged into another branch that is now closed (but where the original branch is still open) is shown misleadingly in the easyhg history display -- the merge from the branch head is not shown, even as a "stub".
$ hg init repo $ cd repo $ touch x ; hg add x ; hg commit -m "add x" $ hg branch y $ touch y ; hg add y ; hg commit -m "add y" $ hg update default $ hg branch z $ touch z ; hg add z ; hg commit -m "add z" $ hg merge y ; hg commit -m "merge y" $ hg update default $ hg merge z ; hg commit -m "merge z" $ hg update z $ hg commit --close-branch -m "close branch z"
Now branch y is still open, and has been merged into a now-closed branch z. EasyMercurial shows this wrongly as in the attached screenshot.
History
#1
Updated by Chris Cannam over 12 years ago
- Subject changed from branch head shown incorrectly when merged into now-closed branch to merge from open branch into a now-closed branch is not displayed
Note, if we commit something else to y, the merge still does not get displayed (i.e. this has nothing to do with special treatment for branch heads).