Opened 7 years ago

Closed 7 years ago

Last modified 7 years ago

#12381 closed defect (fixed)

AssertionError on "Resolve to their versions"

Reported by: Aurimas Owned by: team
Priority: normal Milestone: 16.02
Component: Core Version: latest
Keywords: Cc:


What steps will reproduce the problem?

  1. Open source:trunk/test/data/regress/12376/multipolygon_hang.osm.bz2
  2. Update modified with Ctrl+Alt+M
  3. Select all conflicts in the conflicts list.
  4. From context menu choose "Resolve to their versions".

What is the expected result?

All conflicts are resloved.

What happens instead?


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

Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2016-01-16 03:00:56 +0100 (Sat, 16 Jan 2016)
Build-Date:2016-01-16 02:34:12
Relative:URL: ^/trunk

Identification: JOSM/1.5 (9480 lt) Linux Ubuntu Xenial Xerus (development branch)
Memory Usage: 607 MB / 3504 MB (400 MB allocated, but free)
Java version: 1.7.0_91-b02, Oracle Corporation, OpenJDK 64-Bit Server VM
Java package: openjdk-7-jre:amd64-7u91-2.6.3-3
VM arguments: [-Djosm.restart=true, -Djosm.home=/home/aurimas/.josm-latest,]
Dataset consistency test: No problems found

- Mapillary (31976)
- apache-commons (31895)
- apache-http (31895)
- buildings_tools (31895)
- download_along (31772)
- log4j (31895)
- measurement (31895)
- utilsplugin2 (31895)

Last errors/warnings:
- W:  Place and residential area: Could not get presets icon presets/places.png
- E: java.lang.AssertionError
- E: java.lang.AssertionError
- W: Unable to delete archived backup file /home/aurimas/.josm-latest/autosave/deleted_layers/test2.osm_20160115_223927904.osm
- E: java.lang.AssertionError

	at org.openstreetmap.josm.gui.conflict.pair.ConflictResolver.decideRemaining(
	at org.openstreetmap.josm.gui.dialogs.ConflictDialog$ResolveToAction.actionPerformed(
	at javax.swing.AbstractButton.fireActionPerformed(
	at javax.swing.AbstractButton$Handler.actionPerformed(
	at javax.swing.DefaultButtonModel.fireActionPerformed(
	at javax.swing.DefaultButtonModel.setPressed(
	at javax.swing.AbstractButton.doClick(
	at javax.swing.plaf.basic.BasicMenuItemUI.doClick(
	at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(
	at java.awt.AWTEventMulticaster.mouseReleased(
	at java.awt.Component.processMouseEvent(
	at javax.swing.JComponent.processMouseEvent(
	at java.awt.Component.processEvent(
	at java.awt.Container.processEvent(
	at java.awt.Component.dispatchEventImpl(
	at java.awt.Container.dispatchEventImpl(
	at java.awt.Component.dispatchEvent(
	at java.awt.LightweightDispatcher.retargetMouseEvent(
	at java.awt.LightweightDispatcher.processMouseEvent(
	at java.awt.LightweightDispatcher.dispatchEvent(
	at java.awt.Container.dispatchEventImpl(
	at java.awt.Window.dispatchEventImpl(
	at java.awt.Component.dispatchEvent(
	at java.awt.EventQueue.dispatchEventImpl(
	at java.awt.EventQueue.access$300(
	at java.awt.EventQueue$
	at java.awt.EventQueue$
	at Method)
	at java.awt.EventQueue$
	at java.awt.EventQueue$
	at Method)
	at java.awt.EventQueue.dispatchEvent(
	at java.awt.EventDispatchThread.pumpOneEventForFilters(
	at java.awt.EventDispatchThread.pumpEventsForFilter(
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(
	at java.awt.EventDispatchThread.pumpEvents(
	at java.awt.EventDispatchThread.pumpEvents(

Attachments (0)

Change History (2)

comment:1 Changed 7 years ago by simon04

Resolution: fixed
Status: newclosed

In 9482/josm:

see #12338 fix #12381 - AssertionError on "Resolve to their versions"

comment:2 Changed 7 years ago by simon04

Milestone: 16.02

Modify Ticket

Change Properties
Set your email in Preferences
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.