Bug 243450

Summary:	deadlock closing edited orm.xml file - HEAD
Product:	[WebTools] WTP Common Tools	Reporter:	David Williams <david_williams>
Component:	wst.common	Assignee:	Chuck Bridgham <cbridgha>
Status:	RESOLVED FIXED	QA Contact:	Konstantin Komissarchik <konstantin>
Severity:	critical
Priority:	P1	CC:	cbridgha, ccc, david_williams, hjzhang, jasonpet, neil.hauge, paul.fullbright, thatnitind
Version:	3.0
Target Milestone:	3.1 M1
Hardware:	PC
OS:	Windows XP
Whiteboard:
Bug Depends on:	231205
Bug Blocks:

Description David Williams

2008-08-07 12:17:12 EDT

+++ This bug was initially created as a clone of Bug #231205 +++

The patches that were attached to the bug 231205 need to be carried over to the HEAD stream as well. 

I know I applied the xml.core patches in maintenance branch, and then tried to "merge" those changes in with the HEAD version of xml.core. 

But, there were a number of "conflicting" changes ... and there were also about 2 or 4 other changes in maintenance branch of xml.core that (apparently) were not in the HEAD branch. 

So ... thought'd I'd leave it to the "core" team :) to sort through and make sure the HEAD branch had the right changes in it (perhaps just re-applying the patch would work, but I'm surprised there were so many differences between the branches, so not sure. )

Comment 1 Carl Anderson

2008-08-21 14:57:28 EDT

Released to HEAD for 3.1