Opened 6 years ago

Last modified 6 years ago

#18212 closed defect

conflict resolution broken for deleted objects via reverter plugin — at Initial Version

Reported by: mkoniecz Owned by: team
Priority: normal Milestone: 19.10
Component: Core Version:
Keywords: template_report conflict Cc:

Description

What steps will reproduce the problem?

  1. Spot copyright violation added in changesets https://www.openstreetmap.org/changeset/72260628 and https://www.openstreetmap.org/changeset/72260619
  2. Use reverter plugin to revert one of changesets
  3. Run into 9k+ conflicts (as someone edited what was added in undiscussed import to remove invalid tags) - note that conflicts are between my version (deleted) and their version (edited), not deleted
  4. Select all conflicts with ctrl+a, right click, select "resolve to my versions"
  5. wait for conflicts to resolve (around one minute)
  6. Try to upload changes

What is the expected result?

I will delete thousands of objects.

What happens instead?

Upload button is grayed out, in slightly older version I was able to press but I was getting message that there are no changes for upload.

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

Import was discussed in https://www.openstreetmap.org/changeset/72260608 and with DWG that confirmed that reverting it is OK.

First revert is in https://www.openstreetmap.org/changeset/75351558

URL:https://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2019-10-08 00:03:30 +0200 (Tue, 08 Oct 2019)
Build-Date:2019-10-08 01:30:52
Revision:15443
Relative:URL: ^/trunk

Identification: JOSM/1.5 (15443 en) Linux Ubuntu 16.04.6 LTS
Memory Usage: 439 MB / 869 MB (173 MB allocated, but free)
Java version: 1.8.0_201-b09, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Screen: :0.0 1920x1080
Maximum Screen Size: 1920x1080
libcommons-logging-java: libcommons-logging-java:all-1.2-1+build1
fonts-noto: fonts-noto:-

Plugins:
+ OpeningHoursEditor (34977)
+ PicLayer (35104)
+ apache-commons (35092)
+ buildings_tools (35171)
+ continuosDownload (82)
+ ejml (35122)
+ geotools (35169)
+ imagery_offset_db (34908)
+ jts (35122)
+ log4j (34908)
+ measurement (35051)
+ reverter (35084)
+ todo (30306)

Validator rules:
+ ${HOME}/Documents/install_moje/OSM software/josm/data/validator/deprecated.mapcss
+ ${HOME}/Documents/install_moje/OSM software/josm/data/validator/unnecessary.mapcss
+ ${HOME}/Documents/install_moje/OSM software/josm/data/validator/combinations.mapcss

Last errors/warnings:
- W: No configuration settings found.  Using hardcoded default values for all pools.
- W: Failed to add ${HOME}/Documents/install_moje/OSM software/josm/data/validator/deprecated.mapcss to tag checker
- W: java.nio.file.NoSuchFileException: ${HOME}/Documents/install_moje/OSM software/josm/data/validator/deprecated.mapcss
- W: Failed to add ${HOME}/Documents/install_moje/OSM software/josm/data/validator/unnecessary.mapcss to tag checker
- W: java.nio.file.NoSuchFileException: ${HOME}/Documents/install_moje/OSM software/josm/data/validator/unnecessary.mapcss
- W: Failed to add ${HOME}/Documents/install_moje/OSM software/josm/data/validator/combinations.mapcss to tag checker
- W: java.nio.file.NoSuchFileException: ${HOME}/Documents/install_moje/OSM software/josm/data/validator/combinations.mapcss

Change History (0)

Note: See TracTickets for help on using tickets.