Modify

Opened 11 years ago

Closed 10 years ago

#4564 closed enhancement (fixed)

conflict manager: highlight conflict on properties

Reported by: skyper Owned by: team
Priority: normal Milestone:
Component: Core Version: latest
Keywords: conflict Cc: skyper

Description

Hi

Please also highlight a conflict on properties (red square) within the conflict manager, like it is done with the other 3 categories.

Thanks

Attachments (2)

layer_bug1.osm (306 bytes) - added by skyper 10 years ago.
file one
layer_bug2.osm (324 bytes) - added by skyper 10 years ago.
file two

Download all attachments as: .zip

Change History (12)

comment:1 Changed 11 years ago by skyper

Type: defectenhancement

comment:2 Changed 10 years ago by skyper

Hey guys.

One and a have year past and I stumbled over this again. Took me about two hours to figure out.

So please.

r4114

Last edited 10 years ago by skyper (previous) (diff)

comment:3 Changed 10 years ago by stoecker

Do you have a test file, which causes a corresponding conflict when uploaded?

comment:4 in reply to:  3 Changed 10 years ago by skyper

Replying to stoecker:

Do you have a test file, which causes a corresponding conflict when uploaded?

Thought you know how to create a conflict !

  1. Just download the same node twice in different layers
  2. move both.
  3. merge both layers you get a conflict.

but anyway, here you go. Just merge the two files.

Changed 10 years ago by skyper

Attachment: layer_bug1.osm added

file one

Changed 10 years ago by skyper

Attachment: layer_bug2.osm added

file two

comment:5 Changed 10 years ago by stoecker

Well, I tried and it works for me as expected.

comment:6 in reply to:  5 Changed 10 years ago by skyper

Replying to stoecker:

Well, I tried and it works for me as expected.

You have a red box for tags but there is not red box for properties. Thus you focus on the conflict on tags and once switched to tags you do not get any information about the conflict in properties. (red box is missing)

comment:7 Changed 10 years ago by stoecker

Yeah I see it. I looked at wrong place till now.

comment:8 Changed 10 years ago by stoecker

Resolution: fixed
Status: newclosed

In [4115/josm]:

fix #4564 - conflict manager: highlight conflict on properties

comment:9 Changed 10 years ago by skyper

Resolution: fixed
Status: closedreopened

Now the red box stays there even without a conflict. Should it not vanish or change to a green ccheckmark ?

comment:10 Changed 10 years ago by stoecker

Resolution: fixed
Status: reopenedclosed

In [4116/josm]:

fix #4564 - conflict manager: highlight conflict on properties

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.