P3D3::Resolved icon always shown in differences view

Create issue
Issue #71 resolved
timeless developer created an issue

== Steps ==

Use the files from issue <<issue 61>>

Select repository "testClone"

Switch to History view

Select revision 3

Use the context menu to Update Repository to Revision

Click the merge toolbar button

Select revision 2


Resolve the merge in your merge tool (it doesn't matter, we aren't going to commit)

Switch to differences view

Select repository "test"

Select repository "testClone"

Select revision 3 in base revision

Select revision 2 in other revision

== Actual Results == There's an icon showing Resolved

== Expected Results == * The resolved icon should only be visible if the '-' revision is selected

== Other bugs which I intend to file later == Selecting the '-' revision is currently impossible The graph is initially wrong after the merge operation necessitating the switch to test / back

Comments (2)

  1. Log in to comment