Bug 73567

Summary: file diff command needs to be updated, -3 option
Product: [Applications] kdevelop Reporter: Jon Smirl <jonsmirl>
Component: generalAssignee: KDevelop Developers <kdevelop-devel>
Status: RESOLVED FIXED    
Severity: normal    
Priority: NOR    
Version: git master   
Target Milestone: ---   
Platform: Compiled Sources   
OS: Linux   
Latest Commit: Version Fixed In:

Description Jon Smirl 2004-01-26 21:47:13 UTC 
Version:           CVS (using KDE Devel)
Installed from:    Compiled sources

file diff is using option -3 which has been obsoleted in current versions of diff.

[jonsmirl@smirl v86bios]$ diff -3
diff: `-3' option is obsolete; omit it
diff: Try `diff --help' for more information.
[jonsmirl@smirl v86bios]$
Comment 1 Jon Smirl 2004-01-26 21:47:30 UTC 
[jonsmirl@smirl v86bios]$ diff -v
diff (GNU diffutils) 2.8.1
Copyright (C) 2002 Free Software Foundation, Inc.
 
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
 
Written by Paul Eggert, Mike Haertel, David Hayes,
Richard Stallman, and Len Tower.
[jonsmirl@smirl v86bios]$
Comment 2 Harald Fernengel 2004-01-26 22:15:23 UTC 
Subject: kdevelop/parts/diff

CVS commit by harald: 

fix for bug 73567 - do not use -u instead of -u3 since it is obsoleted

CCMAIL: 73567-done@bugs.kde.org


  M +1 -1      diffpart.cpp   1.28


--- kdevelop/parts/diff/diffpart.cpp  #1.27:1.28
@@ -143,5 +143,5 @@ void DiffPart::localDiff()
 
   *proc << "diff";
-  *proc << "-u3" << popupFile.path() << "-";
+  *proc << "-u" << popupFile.path() << "-";
   proc->setWorkingDirectory( popupFile.directory() );