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: | hg fetch fails when merging changes in binary libraries | ||
---|---|---|---|
Product: | www | Reporter: | Jan Lahoda <jlahoda> |
Component: | Builds & Repositories | Assignee: | Michal Zlamal <mzlamal> |
Status: | RESOLVED INVALID | ||
Severity: | blocker | CC: | issues |
Priority: | P1 | ||
Version: | 6.x | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | DEFECT | Exception Reporter: |
Description
Jan Lahoda
2008-08-11 15:19:21 UTC
The behavior is correct you were tried to merge file which was changed by somebody other. You just need to update the external file once more and then commit it. You don't need to clone again. If you want to re-do the merge, you can just run: hg up -C, hg merge and you're done. The bug is real; it is due to the fact that Mercurial does not properly consult encode/decode hooks when merging. Anyway we plan to cease using the external binaries hook very soon. |