[NETBEANS-1565] SVN Resolve Conflict output incomplete

• Type: Bug
• Status: Open
• Priority: Major
• Resolution: Unresolved
• Affects Version/s: 10.0, 11.0
• Component/s: versioncontrol - Subversion

Environment

Windows 10
Product Version: Apache NetBeans IDE Dev (Build incubator-netbeans-release-345-on-20181002)

• Assignee: Unassigned
• Reporter: Daniel Warren
• Created: 26/Oct/18 15:24
• Updated: 14/Jun/19 00:22

Description

Steps

1. Invoke Subversion | Resolve Conflicts... popup menu action on "Main.java" node.
2. Merging tool must get opened in editor area highlighting the lines with conflicts. Left pane should read "Local Working File", right pane "Remote file" and bottom should read "Result after merge".
3. Select left modification (the working one) and push Accept & Next button above its pane.
4. Make sure that colors changed to blue or green and the cursor (asterisk) moved to the next line of conflict.
5. Push OK button. Question dialog shows up. There should be a message that not all conflicts were resolved. Push Cancel.
6. Select left modification (the working one) and push Accept button above its pane.
7. Make sure that colors changed to blue or green and "Unresolved" in top of the component says "0" conflicts. Push OK button and confirm your decision.

   Expected result:

   The "Main.java" node should change back to normal and should have appropriate badge (blue badges for path). In addition, the merge tool must be closed.

   ---

   After step 7 the resulting file still has '||||||| .r4' at the two locations where the conflict occured. To my understanding this is not the expected result after the merge.