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 128003 - Show History - add option to Show/Hide Merges
Summary: Show History - add option to Show/Hide Merges
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: 6.x
Hardware: Sun All
: P3 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-02-21 10:58 UTC by John Rice
Modified: 2008-02-21 16:11 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
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 John Rice 2008-02-21 10:58:00 UTC 
Add an option to the Show History panel to show/ hide merges when running the search. This is very useful in large repos
where you tend to have a lot of automated merges being put back into the repo, that really have little information
content when looking at the history.

Will put a checkbox beside the current Search| Diff buttons. The setting will be global and persistent, defaulting to
Show Merges initially.
Comment 1 John Rice 2008-02-21 16:11:30 UTC 
Added Show Merges checkbox to Show History, Incoming and Outgoing. Need to enable search in Incoming and Outgoing for
this to be really useful, this is logged as #126903.

Also outputting search context to repo tab.

bash-3.2$ hg log -r 68835
changeset:   68835:b89aa33ace47
tag:         tip
user:        jrice@netbeans.org
date:        Thu Feb 21 15:55:04 2008 +0000
summary:     #128003: Add support to Show/Hide Merges in Show History