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: | Invoking Resolve Conflicts... took 307811 ms. | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | manubing <manubing> |
Component: | Subversion | Assignee: | issues@versioncontrol <issues> |
Status: | RESOLVED FIXED | ||
Severity: | blocker | CC: | hmichel |
Priority: | P3 | ||
Version: | 6.x | ||
Hardware: | All | ||
OS: | All | ||
URL: | http://statistics.netbeans.org/exceptions/detail.do?id=157422 | ||
Issue Type: | DEFECT | Exception Reporter: | 157422 |
Attachments: | nps snapshot |
Description
manubing
2009-08-31 10:51:26 UTC
Created attachment 86838 [details]
nps snapshot
fix: cdev #3b2bca87aded resolving conflicts and refresh done outside of AWT. Integrated into 'main-golden', will be available in build *200909010201* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/3b2bca87aded User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #171155 - Invoking Resolve Conflicts... took 307811 ms. Resolving conflicts and following refresh done outsite of AWT |