This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
| Summary: | Last releases do not work with most recent trunk sources | ||
|---|---|---|---|
| Product: | apisupport | Reporter: | Jaroslav Tulach <jtulach> |
| Component: | Project | Assignee: | Jesse Glick <jglick> |
| Status: | VERIFIED FIXED | ||
| Severity: | blocker | CC: | anebuzelsky, musilt2, sustaining |
| Priority: | P2 | ||
| Version: | 6.x | ||
| Hardware: | All | ||
| OS: | All | ||
| Issue Type: | DEFECT | Exception Reporter: | |
| Attachments: |
Proposed patch
NBM created from release61 + patch |
||
|
Description
Jaroslav Tulach
2008-06-25 09:07:11 UTC
Well, to 6.1 anyway. (Patch 2? Or is it Patch 3 now? http://wiki.netbeans.org/NetBeans6.1PatchesInfo is unclear.) The current patch can be gotten from: hg diff -r 49bddf05fdce -r 4bfd63bd235a apisupport.project/src after undoing a few bogus lines from a bad merge of Evaluator.java. This seems to correspond to these changesets: c5866b743b42 5383786c106c 5846e6f0f3fa ac10e8121c11 2fd8f7dc57f5 9ec1881e57f5 8b07bae54bc5 b91bb5a5841c 5031d4cbefd7 8cee208f2bcc 363f018a0c8c f9ab4aff65e6 6afa197c5766 TBD whether there are other changes which should be made in trunk and also backported. Probably need to let people use trunk builds for a few days and see what comes up. patch 2 is on the way to users. It can be fixed in patch 3. TM=6.1 has no sense when the release is out Created attachment 63563 [details]
Proposed patch
Well then I guess it's FIXED for 6.5 M2, but still a candidate for 6.1_whatever. I have attached a patch which applies cleanly against release61. (Did not check against release61_fixes since this is not currently a strict superset of release61.) It seems to work well after light testing, against modules in both the release61 and main source trees. I did not attempt to verify compatibility with external modules, though I do not know of any problems. Tomasi, could you verify the patch with 6.1? Jesse, could you please attach JAR with applied patch for 6.1? It will make verification for me easier... (i do not have clone of 6.1) Thanks in advance. Created attachment 63622 [details]
NBM created from release61 + patch
Thanks. JAR worked ok for me ok together with 6.1 and 6.1patch2 bits. tried following areas (based on changes in diff): - test execution for some modules - test compile single - separate execution of single test class - debugging qa-func test - adding/editing/removing deps via qa-func.libraries test node Jesse, can you integrate fix it into 6.5 M1? (The sooner, the better...) I'm reopening this one to get it fixed into 6.5 M1. Jesse, please push the fix into the release65_m1 clone and close as fixed again. The issue has been tested in trunk therefore we do not expect any problems. Thank you. OK, pushed fix: http://hg.netbeans.org/release65_m1/rev/b0ed03eede9b tried the same scenarios as before, everything works -> verified in recent m1 build. I've integrated the attached patch http://www.netbeans.org/nonav/issues/showattachment.cgi/63563/apisupport-simpletests-138191.diff into release61_fixes repository as two changesets http://hg.netbeans.org/release61_fixes/rev/0251b14ea683 and http://hg.netbeans.org/release61_fixes/rev/0a3ff180b73c OK. I assume you forgot to add TestDataDirsNodeFactory.java before committing and so accidentally had to create a second changeset? Do you not know about 'hg import', which not only would do all this for you automatically but also correctly processes binary files and renames (if fed a patch in the recommended --git diff style)? verified in patch3 (2008-08-12_03-59-31) |