When pulling changesets, using the merge option always opens the commit dialog and displays 'Problem Occurred' window containing no details
Created originally on Bitbucket by colin-hurley (Colin Hurley)
Environment
- Mercurial 4.2.2
- Eclipse RCP Neon 3
- MercurialEclipse 2.4.1.201711121153
Steps to reproduce
Create test repository with this script:
#!bat
rem Create repo the-master with two revisions
hg init the-master
cd the-master
rem Revision 0 = create .hgignore and initial file1.txt
echo .settings/ >.hgignore
echo .project >>.hgignore
echo line 1 >file1.txt
hg commit -Am "Add .hgignore and file1.txt"
rem Revision 1 = Add line to file1.txt
echo line 2 >>file1.txt
hg commit -m "Add line 2 to file1.txt"
rem Clone revision 0 from the-master to create the-clone
cd ..
hg clone the-master the-clone -r 0
cd the-clone
rem Create a non-conflicting revision in the-clone
echo line a >>file2.txt
hg commit -Am "Add file2.txt"
Import the-clone repo into Eclipse
- File > Open Projects from File System...
- Click Directory... and browse to the-clone directory
- Click Finish
Attempt the pull + merge
- Right-click the-clone project and select Team > Pull...
- Select the 'Merge and, if there are no conflicts, commit after update' option
- De-select the 'Edit commit message before committing merge' option
- De-select the 'Update after pull' option
Expected behavior
- The pull wizard should close without any errors.
- The commit dialog should not be displayed.
- The merge should automatically be committed.
Actual behavior
- The commit dialog is opened (it should auto-commit without showing this dialog because 'Edit commit message...' is not selected)
- The 'Problem Occurred' dialog opens, but it contains no details for the problem
- The pull wizard remains open (probably a result of whatever is opening the 'Problem Occurred' dialog)
Other thoughts
- When the 'Update after pull' option is selected, an additional error occurs because it tries to update while the merge is still waiting to be committed. Of course, it probably doesn't even make sense to use the merge and update options together, so the dialog should auto-de-select update when merge is selected and vice-versa (it already does this for merge and rebase).