source: josm/trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @3719   13 years bastiK added missing license information
(edit) @3426   14 years stoecker see #5303 - some cleanup patches from matthew Bell - partially applied only
(edit) @3423   14 years stoecker fix #5221 - patch by Upliner - errors in conflict manager
(edit) @3377   14 years mjulius Don't set the modified flag when merging a semantically equal …
(edit) @3362   14 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3336   14 years stoecker #close #5135 - allow undeleting without recreating object - patch by …
(edit) @3053   14 years jttt Fix tests
(edit) @3040   14 years mjulius in DataSetMerger use PrimitiveId instead of UniqueId for mergedMap - …
(edit) @3039   14 years mjulius fixes #4522 - Merging between layers throws unnecessary conflicts for …
(edit) @3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @3033   14 years jttt Fix #4572 after update data - way contains deleted member
(edit) @2990   14 years jttt Fix some eclipse warnings
(edit) @2985   14 years jttt Make DataChangedListener deprecated (replaced by DatasetListener), …
(edit) @2935   14 years mjulius fixes #4476 - Deleted nodes cause an conflict if the data is …
(edit) @2933   14 years mjulius fixes #4467 - Don't silently drop locally deleted member primitives …
(edit) @2845   14 years mjulius fix messages for data
(edit) @2753   14 years Gubaer fixed #4295: Relations don't update properly
(edit) @2634   14 years mjulius really fixes #4088 - Remove modified flag when merging downloaded data
(edit) @2626   14 years jttt Fixed some of the warnings found by FindBugs
(edit) @2609   14 years stoecker applied #4146 - patch by mjulius - fix downloading incomplete relation
(edit) @2591   14 years jttt Fix #4114 - NPE when zooming out after updating a partially downloaded …
(edit) @2589   14 years stoecker small code cleanup
(edit) @2587   14 years jttt Added Way.hasIncompletNodes(), Way.isIncomplete() now returns true …
(edit) @2578   14 years jttt Encalupse OsmPrimitive.incomplete
(edit) @2563   14 years Gubaer fixed #3400: relation editor: improvement to highlight an element …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2497   14 years jttt Added Dataset.beginUpdate and Dataset.endUpdate that can be used to …
(edit) @2484   14 years Gubaer fixed #3925: Download relation members takes a long time to return
(edit) @2471   14 years Gubaer fixed #3963: Synchronize does not work
(edit) @2444   14 years Gubaer fixed #3908: Exception when updating a way fixed a few I18n issues
(edit) @2443   14 years Gubaer Fixes problems with merging
(copy) @2433   14 years Gubaer Improved test cases for MergeVisitor. Moved MergeVisitor and removed …
copied from trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java
(edit) @2418   14 years Gubaer Another update of MergeVisitor. Improves merging of node lists and …
Note: See TracRevisionLog for help on using the revision log.