View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0006261 | DarkRadiant | Map Editing | public | 26.02.2023 05:23 | 26.02.2023 06:20 |
| Reporter | greebo | Assigned To | greebo | ||
| Priority | normal | Severity | normal | Reproducibility | have not tried |
| Status | resolved | Resolution | fixed | ||
| Product Version | 3.8.0 | ||||
| Target Version | 3.9.0 | Fixed in Version | 3.9.0 | ||
| Summary | 0006261: Three-way merge produces duplicate primitives when a func_static is moved | ||||
| Description | Instead of removing the "old" primitves and adding them in their new location, just the addition is performed. We end up with both the original and the moved primitives. | ||||
| Tags | No tags attached. | ||||
|
DarkRadiant: master 8304beae 26.02.2023 05:24 Details Diff |
0006261: Extend three way merge test maps with the problematic scenario |
Affected Issues 0006261 |
|
| mod - test/resources/tdm/maps/threeway_merge_base.mapx | Diff File | ||
| mod - test/resources/tdm/maps/threeway_merge_source_1.mapx | Diff File | ||
| mod - test/resources/tdm/maps/threeway_merge_target_1.mapx | Diff File | ||
|
DarkRadiant: master 6fd1ae5f 26.02.2023 05:36 Details Diff |
0006261: Extend unit test code |
Affected Issues 0006261 |
|
| mod - test/MapMerging.cpp | Diff File | ||
|
DarkRadiant: master 85c3e4db 26.02.2023 06:20 Details Diff |
0006261: When applying a primitive removal found in the diff between source and base, the primitive in the *target* map needs to be marked for removal |
Affected Issues 0006261 |
|
| mod - libs/scene/merge/ThreeWayMergeOperation.cpp | Diff File | ||
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 26.02.2023 05:23 | greebo | New Issue | |
| 26.02.2023 05:23 | greebo | Assigned To | => greebo |
| 26.02.2023 05:23 | greebo | Status | new => assigned |
| 26.02.2023 06:20 | greebo | Changeset attached | => DarkRadiant master 8304beae |
| 26.02.2023 06:20 | greebo | Changeset attached | => DarkRadiant master 6fd1ae5f |
| 26.02.2023 06:20 | greebo | Changeset attached | => DarkRadiant master 85c3e4db |
| 26.02.2023 06:20 | greebo | Target Version | => 3.9.0 |
| 26.02.2023 06:20 | greebo | Status | assigned => resolved |
| 26.02.2023 06:20 | greebo | Resolution | open => fixed |
| 26.02.2023 06:20 | greebo | Fixed in Version | => 3.9.0 |
