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 71945 - Make "Export Diff Patch" use -u
Summary: Make "Export Diff Patch" use -u
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 6.x
Hardware: All All
: P2 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
: 105411 (view as bug list)
Depends on:
Blocks:
 
Reported: 2006-01-27 21:04 UTC by Jesse Glick
Modified: 2007-06-27 13:05 UTC (History)
1 user (show)

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 Jesse Glick 2006-01-27 21:04:33 UTC 
A lot of people prefer -u patches to -c, but the IDE generates -c. Could it
generate -u instead (or let you choose)?
Comment 1 Jesse Glick 2007-01-05 23:35:35 UTC 
Yarda says "I guess there was a consensus that whenever some feature of
versioning support in NetBeans is blocking our development it is a P2 bug". I
have been repeatedly having to ask people submitting API changes for code review
to use command-line CVS to perform the diff because the -c patch is difficult to
read.

Note that my ~/.cvsrc specifies

diff -u

so it is really a bug when the IDE ignores that.
Comment 2 Maros Sandor 2007-01-08 09:09:40 UTC 
There is also the Apply Diff Patch that would have to be implemented. Ok then,
we'll try to "fix" them.
Comment 3 Maros Sandor 2007-06-04 09:49:51 UTC 
*** Issue 105411 has been marked as a duplicate of this issue. ***
Comment 4 Maros Sandor 2007-06-27 13:05:14 UTC 
Unified format is now used by default in textual diff output.

/shared/data/ccvs/repository/diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/UnifiedDiffTest.java,v  <--
 UnifiedDiffTest.java
initial revision: 1.1
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/builtin/visualizer/TextDiffEditorSupport.java,v  <-- 
TextDiffEditorSupport.java
new revision: 1.14; previous revision: 1.13
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/builtin/visualizer/TextDiffVisualizer.java,v  <-- 
TextDiffVisualizer.java
new revision: 1.15; previous revision: 1.14
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/builtin/visualizer/UnifiedDiff.java,v  <--  UnifiedDiff.java
initial revision: 1.1
/shared/data/ccvs/repository/diff/nbproject/project.properties,v  <--  project.properties
new revision: 1.13; previous revision: 1.12
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/diff/ExportDiffAction.java,v
 <--  ExportDiffAction.java
new revision: 1.39; previous revision: 1.38
/shared/data/ccvs/repository/subversion/main/src/org/netbeans/modules/subversion/ui/diff/ExportDiffAction.java,v  <-- 
ExportDiffAction.java
new revision: 1.16; previous revision: 1.15