Questions tagged [file-diffs]
19 questions
83
votes
5 answers
Suppressing diffs for deleted files in git
I want to get a quick overview of the local changes in my repository, but I don't want a diff that shows deleted files, since every single line is a minus.
Basically, I want something like 'git diff HEAD
- '. In an ideal…

Alex Feinman
- 5,393
- 1
- 30
- 48
18
votes
6 answers
Copy only difference (kdiff, winmerge, any diff like tool)
Is there possibility of copy ONLY difference of two files? Like in winmerge, but, I can't find this option
Just like on this screen- i want to copy only 'yellow part' . Of course I can do that manually, but in big file it's not too funny :-)

Nicramus
- 606
- 1
- 6
- 19
9
votes
3 answers
How to link external diff tool(beyond compare) in source tree?
I am using Source tree client for Git on windows 7. I have used beyond compare with tortoisehg client for mercurial and I like to use Beyond compare itself as diff too in SourceTree too. I set the diff tool to beyond compare in Tools -> Options but…

vinmm
- 277
- 1
- 3
- 14
5
votes
2 answers
Difficulty understanding Paul Heckel's Diff Algorithm
I have been looking at Paul Heckel's Diff Algorithm and I don't seem to understand it fully.
I copied steps 1-5 as shown in Python code but I can't get it to show the differences using the final step of the algorithm. I would be grateful if someone…

Tuffail
- 77
- 6
5
votes
2 answers
Is there a file diff tool that allows for exceptions?
We currently use Beyond Compare 3.0 and I am quite pleased with it. However, it would be great if I could easily specify an exclusion for a specific one-time case. This is needed when I am doing a code review of some refactoring. For instance:
Old…

Kevin
- 7,856
- 11
- 35
- 40
4
votes
2 answers
Compare files in two different directories in Linux
A shell script which shows differences in multiple files in two different directories and also possibly create an output file including where all mismatches were found.
Condition
File dir1/file1 compare only with dir2/file1 (similarly for other…

user3750136
- 69
- 1
- 5
3
votes
1 answer
Diffing two folders (like the diff tool in Linux) with Python
I'm trying to write a project that will have some autonomous components. One of these is the need to diff two folders and spit out the different files into an array of strings. Dircmp does part of this - it spits out the different files. But it…

Dr.McNinja
- 455
- 1
- 6
- 15
2
votes
0 answers
Why the button "Tree Hierarchy" in Folder Diff of Perforce disabled?
I have a problem when using Perforce.
I'm using P4V, but don't know the Perforce Server version.
There are often some files in our project that don't need to be version-controlled. And I found a way to exclude folders or files from Perforce by…

Roc Ho
- 317
- 1
- 3
- 11
2
votes
1 answer
Provide log if the two files are identical and has same contents in Java
I have below code where i am reading the file from particular directory, processing it and once processed i am moving the file to archive directory. This is working fine. I am receiving new file everyday and i am using Control-M scheduler job to run…

Andrew
- 3,632
- 24
- 64
- 113
1
vote
2 answers
ask github or sourcetree to ignore moved lines?
I'm using Git to keep track of the changes I make to my project. I often move entire sections around within my files.
When I view diffs using Sourcetree and GitHub for OSX, it shows me those moved lines as deleted (and shows them as new lines…

incandescentman
- 6,168
- 3
- 46
- 86
1
vote
2 answers
Source-tree diff summary information
I'd like to find out what has changed between versions of a large project such as Mozilla-Firefox, i.e. similar to the question but must work on Linux and is open-source. I'm aware of Source Code Diff / Line and File Comparison which is Windows…

Sean
- 3,765
- 3
- 26
- 48
0
votes
0 answers
How to compare two files in Python and list how many lines are changed
I need to compare the two files in Python and then count the number of lines that are changed.
Problem Statement:
I have to give a report on monthly basis, that in a project, how many files are present and how many lines each file has and during the…

xpress_embedo
- 377
- 1
- 4
- 18
0
votes
1 answer
How to identify files updated outside of TFS
We have a nopCommerce website of a client's that one of their IT guys was modifying views directly on the web server. They now want to do more extensive changes so we want to put the baseline NopCom code in TFS.
Then, ideally, we'd like to be able…

crichavin
- 4,672
- 10
- 50
- 95
0
votes
0 answers
How to compare the following file format?
I have to compare the two files having 50K records in each file.
The records are in text file but in following format :
Each line is having records.
If the records are same in both the files (comparing line by line) then we have to find the…

rockersdeal
- 71
- 12
0
votes
0 answers
Java Program to View the file Diff
Result.jsp :
<%@page import="org.apache.commons.lang3.StringUtils"%>
<%@page import="java.util.ArrayList"%>
<%@page import="java.util.Iterator"%>
<%@page import="java.util.ArrayList"%>
<%@page import="util.Utility"%>
<%@ page…

Srinath
- 1