Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 357219

Summary: [Compatibility] Subversive "Edit conflicts" after merge gives NPE
Product: z_Archived Reporter: Thomas Kratz <eiswind>
Component: E4Assignee: Project Inbox <e4.runtime-inbox>
Status: CLOSED DUPLICATE QA Contact:
Severity: normal    
Priority: P3 CC: remy.suen
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: Windows 7   
Whiteboard:
Attachments:
Description Flags
Log snippet none

Description Thomas Kratz CLA 2011-09-09 08:05:54 EDT 
Build Identifier: 4.1

Subversive "Edit conflicts" after merge gives NPE

Reproducible: Always

Steps to Reproduce:
1. merge files that have conflicts with subversive
2. hit "Edit conflicts"
3. boom
Comment 1 Remy Suen CLA 2011-09-09 08:26:12 EDT 
I guess there was nothing in the logs, Thomas?
Comment 2 Thomas Kratz CLA 2011-09-09 09:12:14 EDT 
Created attachment 203054 [details]
Log snippet

Hi Remy, could have searched the log before. This is what I found
Comment 3 Remy Suen CLA 2011-09-09 09:16:07 EDT 
(In reply to comment #2)
> Created attachment 203054 [details]
> Log snippet

Hi Thomas, thanks for the log, I believe this bug should be fixed in 3.8/4.2.

*** This bug has been marked as a duplicate of bug 354593 ***