Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 357219 - [Compatibility] Subversive "Edit conflicts" after merge gives NPE
Summary: [Compatibility] Subversive "Edit conflicts" after merge gives NPE
Status: CLOSED DUPLICATE of bug 354593
Alias: None
Product: z_Archived
Classification: Eclipse Foundation
Component: E4 (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-09 08:05 EDT by Thomas Kratz CLA
Modified: 2012-12-13 15:00 EST (History)
1 user (show)

See Also:

Attachments
Log snippet (2.14 KB, text/plain)
2011-09-09 09:12 EDT, Thomas Kratz CLA 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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 ***