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: | Add 'Diff To' Action in 'Search Results' view | ||
|---|---|---|---|
| Product: | utilities | Reporter: | tomzi <tomzi> |
| Component: | Search | Assignee: | Jaroslav Havlin <jhavlin> |
| Status: | RESOLVED DUPLICATE | ||
| Severity: | normal | ||
| Priority: | P3 | ||
| Version: | 7.4 | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Issue Type: | ENHANCEMENT | Exception Reporter: | |
Already fixed in daily builds: Select both files -> right-click -> More -> Tools -> Diff. Thank you for reporting. *** This bug has been marked as a duplicate of bug 185030 *** |
The fastest way to get a diff of one file between to branches if you have them checked out locally is: Currently: .) Select the two parentdirectory of both branches in 'Favourites View' eg. branch1, branch2 .) Right click 'Find...' .) Enter 'MyFile.java' This will show: [-] Found 2 matching files. MyFile.java [branch1] MyFile.java [branch2] But I can not 'Diff' between them, currently only the actions 'Edit' and 'Hide' can be selected. Expected: .) Select both file and 'right-click'/Diff To. I know there exists a workaround by .) opening both files in favourites view .) select one file, shift select the other file ,) select 'diff' But this is way complicated if I already have the two files in the 'Search result' view. Product Version = NetBeans IDE 7.4 (Build 201310111528) Operating System = Linux version 3.8.0-32-generic running on amd64 Java; VM; Vendor = 1.7.0_45 Runtime = Java HotSpot(TM) 64-Bit Server VM 24.45-b08