Bug #292
Merge that results in no changes leaves interface in inconsistent state
| Status: | Closed | Start date: | 2011-09-16 | |
|---|---|---|---|---|
| Priority: | Normal | Due date: | ||
| Assignee: |  Chris Cannam | % Done: | 0% | |
| Category: | - | |||
| Target version: | 1.1 |
Description
If you try to merge between two branches that have identical content (but neither is an ancestor of the other), Mercurial will quite happily let you, resulting in a true merge changeset with two parents but no content. You can then commit this despite it changing no files.
EasyHg doesn't cope with this properly -- it shows the status correctly as "merged but not yet committed on branch X" but the Commit button is nonetheless disabled.
History
#1
Updated by Chris Cannam over 12 years ago
(This also happens if the two branches are not identical but the one being merged into the current working copy is identical to an ancestor -- then no changes are introduced even though the merge is successful. Just ran into this in svcore with real data -- thanks Mathieu!)
#2
Updated by Chris Cannam over 12 years ago
- Status changed from New to Closed
Fixed in 1c05e7576ea5