Bug 243450 - deadlock closing edited orm.xml file - HEAD
Summary: deadlock closing edited orm.xml file - HEAD
Status: RESOLVED FIXED
Alias: None
Product: WTP Common Tools
Classification: WebTools
Component: wst.common (show other bugs)
Version: 3.0   Edit
Hardware: PC Windows XP
: P1 critical (vote)
Target Milestone: 3.1 M1   Edit
Assignee: Chuck Bridgham CLA
QA Contact: Konstantin Komissarchik CLA
URL:
Whiteboard:
Keywords:
Depends on: 231205
Blocks:
  Show dependency tree
 
Reported: 2008-08-07 12:17 EDT by David Williams CLA
Modified: 2008-08-21 14:57 EDT (History)
8 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description David Williams CLA 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 CLA 2008-08-21 14:57:28 EDT
Released to HEAD for 3.1