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.

Bug 202697 - Editor-Folds are not expanded when resolving conflicts after a SVN update
Summary: Editor-Folds are not expanded when resolving conflicts after a SVN update
Status: RESOLVED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 7.0.1
Hardware: All All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-26 19:32 UTC by K__P
Modified: 2011-10-04 14:07 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description K__P 2011-09-26 19:32:48 UTC 
Hi,
I discovered that code segments that are enclosed in an editor-fold such as //<editor-fold defaultstate="collapsed" desc="...)"> do not get expanded automatically when resolving conflicts after a SVN merge (probably also after an SVN update). This makes it somewhat difficult to see which changes I would like to keep, especially since the '+'-button to expand the editor-fold is also missing. Please expand all editor-folds automatically (or implement the usual '+'-button)  during conflict resolving.

Thanks a lot and best regards,
Kurt

Product Version = NetBeans IDE 7.0.1 (Build 201107282000)
Operating System = Mac OS X version 10.6.8 running on x86_64
Java; VM; Vendor = 1.6.0_26
Runtime = Java HotSpot(TM) 64-Bit Server VM 20.1-b02-384
Comment 1 Ondrej Vrabec 2011-10-03 15:57:38 UTC 
fix: http://hg.netbeans.org/core-main/rev/380da3ed4a35
Comment 2 Quality Engineering 2011-10-04 14:07:25 UTC 
Integrated into 'main-golden'
Changeset: http://hg.netbeans.org/main-golden/rev/380da3ed4a35
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #202697 - Editor-Folds are not expanded when resolving conflicts after a SVN update