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: | Apply patch doesn't work as expected | ||
|---|---|---|---|
| Product: | utilities | Reporter: | _ mihmax <mihmax> |
| Component: | Diff | Assignee: | Martin Entlicher <mentlicher> |
| Status: | CLOSED FIXED | ||
| Severity: | blocker | ||
| Priority: | P2 | ||
| Version: | 3.x | ||
| Hardware: | PC | ||
| OS: | Windows ME/2000 | ||
| Issue Type: | DEFECT | Exception Reporter: | |
| Attachments: |
Original file
Patched file The patch itself Patched file (real) |
||
|
Description
_ mihmax
2002-08-23 20:50:17 UTC
Created attachment 7201 [details]
Original file
Created attachment 7202 [details]
Patched file
Created attachment 7203 [details]
The patch itself
Created attachment 7204 [details]
Patched file (real)
Sorry, first "Patched file" was wrong (simply another file). "Patched file (real)" - the errorful one. I cannot apply patches sent by other people with this bug. I was able to reproduce the problem. It seems, that the only problem is the "*/", that is for some reason added at the end of the merged patch. I'll explore that. The bug is in the parsing algorithm of the context diff. The same patch in standard UNIX diff format was applied correctly. Scheduling target to 4.0. Fixed in the main trunk. Apply of context patches should work correctly in dev builds from 20020830 and newer. /cvs/diff/src/org/netbeans/modules/diff/builtin/Patch.java,v <-- Patch.java new revision: 1.8; previous revision: 1.7 I propose this as a candidate into 3.4.1. it works, I get the correct patched file, thanks commited to release341 branch Resolved for 3.3.x or earlier, no new info since then -> closing. |