Daniel Warren created NETBEANS-1565:
---------------------------------------
Summary: SVN Resolve Conflict output incomplete
Key: NETBEANS-1565
URL: https://issues.apache.org/jira/browse/NETBEANS-1565
Project: NetBeans
Issue Type: Bug
Components: versioncontrol - Subversion
Affects Versions: 10.0
Environment: Windows 10
Product Version: Apache NetBeans IDE Dev (Build
incubator-netbeans-release-345-on-20181002)
Reporter: Daniel Warren
h3. Steps
# Invoke *Subversion | Resolve Conflicts...* popup menu action on "Main.java"
node.
# 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".
# Select left modification (the working one) and push *Accept & Next* button
above its pane.
# Make sure that colors changed to blue or green and the cursor (asterisk)
moved to the next line of conflict.
# Push *OK* button. Question dialog shows up. There should be a message that
not all conflicts were resolved. Push *Cancel*.
# Select left modification (the working one) and push *Accept* button above
its pane.
# 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.
h3. 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.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
