View Issue Details

IDProjectCategoryView StatusLast Update
0006192DarkRadiantMap Editingpublic11.12.2022 21:13
ReporterDragofer Assigned To 
PrioritynormalSeveritynormalReproducibilityhave not tried
Status newResolutionopen 
Product Version3.7.0 
Summary0006192: Unhandled exception when dragging orthoview during 3-way merge preview
DescriptionI've recently used the 3-way merge feature to reconcile parallel edits of myself and Bikerdude to the same rev of the Seeking Lady Leicester map (one of the FMs left behind by grayman) while helping him out with some scripted scenes.

The result of the merge seems fine, but I got an “unhandled exception” dialog (with no text except for the title) during the preview stage almost immediately after I tried to drag orthoview around to preview the changes, and had to use task manager to terminate the process and start over.
Steps To ReproduceI’ve sent you a link via Discord to the slightly trimmed current state of the Seeking Lady Leicester FM which contains various versions of the seeking.map:
- seeking_common.map: the map rev bikerdude and me both made changes on
- seeking_bkd.map: the map with bikerdude’s changes
- seeking_drago.map: the map with my changes
- seeking_merged.map: the map I got as a result of the 3-way merge, included for interest
https://discord.com/channels/@me/1010077603899654184/1051571770194415646

Repro steps:
1) Start DR, open seeking_drago.map.
2) File > Merge Map > seeking_drago.map should already be entered as the “Merge Target”.
3) Set seeking_bkd.map as the “Map to be merged” and “seeking_common.map” as the “Common ancestor”.
4) Click “Start Merge”. Eventually orthoview switches into a merge preview. Drag the orthoview around to check whether you get an unhandled exception.
TagsNo tags attached.

Activities

There are no notes attached to this issue.

Issue History

Date Modified Username Field Change
11.12.2022 18:48 Dragofer New Issue
11.12.2022 18:52 Dragofer Steps to Reproduce Updated
11.12.2022 21:13 Dragofer Description Updated