Modify

Opened 11 years ago

Closed 3 years ago

Last modified 3 years ago

#8948 closed defect (fixed)

conflicts on nodes about parent way after revert

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

Description

Since of

What steps will reproduce the problem?

  1. open attached file
  2. select all objects
  3. revert selection from changeset 16833418.

What is the expected result?

To get real conflicts see #8947.

What happens instead?

The three conflicts are all about having a parent way or not and not at all conflicts. The real conflicts are not shown.

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

Repository Root: http://josm.openstreetmap.de/svn
Build-Date: 2013-08-08 01:35:22
Last Changed Author: Don-vip
Revision: 6117
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
URL: http://josm.openstreetmap.de/svn/trunk
Last Changed Date: 2013-08-07 22:11:35 +0200 (Wed, 07 Aug 2013)
Last Changed Rev: 6117

Identification: JOSM/1.5 (6117 en) Linux Debian GNU/Linux 7.1 (wheezy)
Memory Usage: 216 MB / 672 MB (52 MB allocated, but free)
Java version: 1.7.0_25, Oracle Corporation, OpenJDK 64-Bit Server VM
Java package: openjdk-7-jre:amd64-7u25-2.3.10-1~deb7u1
Program arguments: [$HOME/rev.osm]
Dataset consistency test: No problems found

Plugin: OpeningHoursEditor (29778)
Plugin: conflation (0.1.6)
Plugin: jts (29613)
Plugin: mirrored_download (29753)
Plugin: notes (0.3)
Plugin: openstreetbugs (29435)
Plugin: reverter (29771)
Plugin: undelete (29555)
Plugin: utilsplugin2 (29771)
Plugin: wikipedia (29778)

Attachments (1)

josm_8948_data_oct_2020.osm.xz (142.7 KB ) - added by skyper 3 years ago.
data of today

Download all attachments as: .zip

Change History (9)

comment:1 by Don-vip, 10 years ago

Summary: conflicts on nodes about parent wayconflicts on nodes about parent way after revert

comment:2 by GerdP, 3 years ago

I cannot reproduce with JOSM r17084 and reverter (35579). Can this be closed?

comment:3 by skyper, 3 years ago

Not sure what to do, as this ticket can be closed but on the other hand I would have to reopen #8947.

I get no conflicts at all but there should be conflicts or am I wrong:

  1. open attached file (Layer A)
  2. select all objects
  3. revert selection from changeset 16833418.
    • no conflicts
  4. duplicate layer A (-> Layer B)
  5. update data of layer A
    • 28 conflicts (13 ways, 15 nodes)
  6. download the area (Layer C)
  7. merge layer B on layer C
    • no conflicts and no object is modified. Changes of layer B are silently dropped.

I would expect the conflicts after the revert or at least when merging the reverted layer on up-to-date data.

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2020-10-25 17:07:27 +0100 (Sun, 25 Oct 2020)
Revision:17265
Build-Date:2020-10-26 02:30:48
URL:https://josm.openstreetmap.de/svn/trunk

Plugins:
+ reverter (35579)
Last edited 3 years ago by skyper (previous) (diff)

comment:4 by GerdP, 3 years ago

Yes, step 3 should produce conflicts.

in reply to:  4 comment:5 by skyper, 3 years ago

Replying to GerdP:

Yes, step 3 should produce conflicts.

Should I open a new ticket and we close this one?

comment:6 by GerdP, 3 years ago

In fact I am not sure if the current behaviour is wanted or not. There is no code in reverter that would download the current version of an object. I think it was different in the past. So yes, please open a new ticket.

comment:7 by skyper, 3 years ago

Resolution: fixed
Status: newclosed

See #20006 for the new ticket. This one is fixed then.

by skyper, 3 years ago

data of today

comment:8 by GerdP, 3 years ago

Milestone: 20.11

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. Next status will be 'reopened'.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.