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

Bug 337852

Summary:

Backport to 3.2.x File Content Conflict is not handled properly

Product:

[Tools] Target Management

Reporter:

David McKnight <dmcknigh>

Component:

RSE

Assignee:

David McKnight <dmcknigh>

Status:

RESOLVED FIXED

QA Contact:

Martin Oberhuber <mober.at+eclipse>

Severity:

normal

Priority:

CC:

samuelwu, xuanchen

Version:

unspecified

Flags:

xuanchen: review+

Target Milestone:

3.2.2+

Hardware:

OS:

Windows XP

Whiteboard:

Bug Depends on:

334839

Bug Blocks:

Attachments:

Description	Flags
backport patch	none
updated patch using PlatformUI.getWorkbench().isClosing()	none

Description David McKnight

2011-02-22 10:58:29 EST

This bug is for the backport of the fix for bug 334839 to the R3_2_maintenance stream.

Comment 1 David McKnight

2011-02-22 10:59:13 EST

Created attachment 189507 [details]
backport patch

Comment 2 David McKnight

2011-02-22 11:01:36 EST

Kevin, could you please review this?

Comment 3 Samuel Wu

2011-02-28 10:25:16 EST

Hi Dave,
Is this patch in the RSE 3.2.2 build yet? Thanks

Comment 4 David McKnight

2011-02-28 10:32:01 EST

Xuan could you please review this?

Comment 5 David McKnight

2011-02-28 10:32:27 EST

Xuan could you please review this?(In reply to comment #2)
> Kevin, could you please review this?

(In reply to comment #3)
> Hi Dave,
> Is this patch in the RSE 3.2.2 build yet? Thanks

No, it hasn't been reviewed yet.

Comment 6 David McKnight

2011-02-28 12:45:16 EST

Created attachment 189973 [details]
updated patch using PlatformUI.getWorkbench().isClosing()

Comment 7 Xuan Chen

2011-03-01 10:27:48 EST

The fix looks good. Thanks.

Comment 8 David McKnight

2011-03-01 10:38:47 EST

Thanks for the review, Xuan.  I've committed the change to cvs.

Comment 9 Martin Oberhuber

2011-03-01 12:23:08 EST

Released into 3.2.2+

Note that from now on, when you want something in 3.2.2+ you'll have to release
it into the Mapfile yourself (after code review from 1 committer).