Unable to resolve conflicts with latest version of plugin (2.7)
Created originally on Bitbucket by cspeckrunmim (Christopher Speck)
Versions
- MercurialEclipse: 2.7 (latest)
- Mercurial: 4.9.1
- Eclipse: 4.10.0 (photon?)
Reproduction Steps
- Rebase a commit onto another which will cause merge conflicts
- Refresh projects in Navigation sidebar
- Refresh status in Navigation sidebar from under Team menu
- Open Merge tab view
- Select project with merge conflict (has red diamond icon)
Normally I do these steps and then view/resolve conflicts from the Merge tab however after step 5 I get an error. I have attached the popup I receive.
A co-worker suggested the issue might be related to the eclipse project not being the root of the mercurial repository. We have one repository which contains numerous eclipse projects, each of which exist in sub-folders of the main repository root.
I attached a textfile of the stacktrace. The eclipse error log had a handful of different errors that all stemmed from this exception but I didn't include them all.
Attachments: errorstacktrace.txt