Modify

Opened 2 years ago

Closed 2 years ago

#15936 closed defect (worksforme)

Conflict resolution won't allow me to apply a resolution if differing tags is the primary issue

Reported by: chris@… Owned by: team
Priority: major Milestone:
Component: Core Version:
Keywords: template_report Cc:

Description

What steps will reproduce the problem?

  1. Submit a changeset with conflicting tags
  2. Open the conflict resolution dialogue (and hope it doesn't freeze on you)
  3. Select the correct tags and click that arrow to send it to the middle
  4. The apply resolution button is still greyed out

What is the expected result?

I'm allowed to apply the resolution

What happens instead?

The "apply resolution" button is unresponsive

Please provide any additional information below. Attach a screenshot if possible.

It's probably some Java on the Mac bug.

URL:http://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2018-01-28 23:08:56 +0100 (Sun, 28 Jan 2018)
Build-Date:2018-01-28 22:25:44
Revision:13367
Relative:URL: ^/trunk

Identification: JOSM/1.5 (13367 en) Mac OS X 10.11.6
OS Build number: Mac OS X 10.11.6 (15G19009)
Memory Usage: 836 MB / 1820 MB (512 MB allocated, but free)
Java version: 1.8.0_161-b12, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Screen: Display 2026427093 1920x1080
Maximum Screen Size: 1920x1080
VM arguments: [-Djava.security.policy=file:<java.home>/lib/security/javaws.policy, -DtrustProxy=true, -Djnlpx.home=<java.home>/bin, -Djava.security.manager, -Djnlpx.origFilenameArg=${HOME}/Library/Application Support/Oracle/Java/Deployment/cache/6.0/56/1ee8cfb8-668392a0, -Djnlpx.remove=false, -Dsun.awt.warmup=true, -Djava.util.Arrays.useLegacyMergeSort=true, -Dmacosx.jnlpx.dock.name=JOSM, -Dmacosx.jnlpx.dock.icon=${HOME}/Library/Application Support/Oracle/Java/Deployment/cache/6.0/16/47ee53d0-5050928a.icns, -Djnlp.application.href=https://josm.openstreetmap.de/download/josm.jnlp , -Djnlpx.jvm="<java.home>/bin/java"]
Dataset consistency test: No problems found

Last errors/warnings:
- W: Conflicts detected - <html>There was 1 conflict detected.</html>
- E: Error header: Version mismatch: Provided 1, server had: 2 of Node 3311151381
- E: Conflicts detected - <html>Uploading <strong>failed</strong> because the server has a newer version of one<br>of your nodes, ways, or relations.<br>The conflict is caused by the <strong>node</strong> with id <strong>3,311,151,381</strong>,<br>the server has version 2, your version is 1.<br><br>Click <strong>Synchronize node 3,311,151,381 only</strong> to synchronize the conflicting primitive only.<br>Click <strong>Synchronize entire dataset</strong> to synchronize the entire local dataset with the server.<br>Click <strong>Cancel</strong> to abort and continue editing.<br></html>
- W: Conflicts detected - <html>There was 1 conflict detected.</html>
- E: Error header: Version mismatch: Provided 1, server had: 2 of Node 3311151382
- E: Conflicts detected - <html>Uploading <strong>failed</strong> because the server has a newer version of one<br>of your nodes, ways, or relations.<br>The conflict is caused by the <strong>node</strong> with id <strong>3,311,151,382</strong>,<br>the server has version 2, your version is 1.<br><br>Click <strong>Synchronize node 3,311,151,382 only</strong> to synchronize the conflicting primitive only.<br>Click <strong>Synchronize entire dataset</strong> to synchronize the entire local dataset with the server.<br>Click <strong>Cancel</strong> to abort and continue editing.<br></html>
- W: Conflicts detected - <html>There were 2 conflicts detected.</html>
- W: Conflicts detected - <html>There were 2 conflicts detected.</html>
- W: Conflicts detected - <html>There were 49 conflicts detected.</html>
- W: Deleted or moved objects - <html>There are 110 objects in your local dataset which might be deleted on the server.<br>If you later try to delete or update them the server is likely to report a conflict.<br>Click <strong>Check on the server</strong> to check the state of these objects on the server.<br>Click <strong>Ignore</strong> to ignore.</html>

Attachments (0)

Change History (1)

comment:1 Changed 2 years ago by chris@…

Resolution: worksforme
Status: newclosed

The resolution will be a better UI to tell you that there are unresolved nodes as well as unresolved tags. The current UI does not make that clear that there are more than just tags to resolve.

Related suggestion: the resolve nodes dialogue should load a mini map so you can preview the different versions.

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.