Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!
Bug 248711 - Full textual diff in commit window should exclude excluded files
Full textual diff in commit window should exclude excluded files
Status: RESOLVED FIXED
Product: versioncontrol
Classification: Unclassified
Component: Git
8.1
All All
: P3 (vote)
: 8.1
Assigned To: Ondrej Vrabec
issues@versioncontrol
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2014-11-18 06:37 UTC by hifi
Modified: 2014-11-20 04:25 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description hifi 2014-11-18 06:37:56 UTC
When you have some temporary files or new files that are not going to be part of your next commit, you exclude them in the commit window. While selective commit on line/hunk level isn't possible yet, complete excluding is and it's frequently used.

The "Diff" tab of commit window also has a line through on excluded files but when you select the full diff it will include those files and the diff can be a bit confusing as it doesn't reflect what you would probably expect.
Comment 1 Ondrej Vrabec 2014-11-18 14:48:19 UTC
fix: http://hg.netbeans.org/core-main/rev/7729162a6dab
Comment 2 Ondrej Vrabec 2014-11-18 14:50:05 UTC
hmm, did help only for files excluded before the commit window has been open/
Comment 3 Ondrej Vrabec 2014-11-18 15:00:45 UTC
along with this fix it should work now as you expect...

fix: http://hg.netbeans.org/core-main/rev/bd58c0a0fd76
Comment 4 Quality Engineering 2014-11-20 04:25:32 UTC
Integrated into 'main-silver', will be available in build *201411200001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/7729162a6dab
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #248711 - Full textual diff in commit window should exclude excluded files
Filter out excluded files before showing the overall diff.


By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo