The act of identifying differences between two or more files in order to support various software development activities (bug tracking, patch creation, ...)
0
votes
1answer
9 views
How do I create a patch from one branch to another using only a subset of the files that were changed?
That is, suppose I want a patch that will take me from branch1 to branch2, but I only care about files foo1.c and foo2.c, whereas other files also changed between the two branches.
How can I make a ...
0
votes
2answers
21 views
A diff which compares changes within lines for Mac OS X
I'm looking for software that would let me apply changes within lines – not necessarily automaticall – rather than the whole line. I read that wdiff can do this, however there is no Mac OS X version.
0
votes
0answers
14 views
Finding non SIMILAR lines on Solaris (or Linux) in two files
I'm trying to compare 2 files on a Solaris box and only see the lines that are not similar. I know that I can use the command given below to find lines that are not exact matches, but that isn't good ...
0
votes
0answers
13 views
Liquibase-maven plugin doesn't detect change between Hibernate hbm.xml and changelog.xml
I recently started on a project that utilizes MySQL database with Maven, Hibernate, and Liquibase, and I am not at all experienced in any of these so please forgive my naivety.
My goal for right now ...
0
votes
2answers
20 views
Reload only new records without having a flag for a new entry.
There is a table in database with 3 columns [StringColumn], [FloatColumn1], [FloatColumn2].
All rows in this table are distinct, no duplicates.
It has about 1M records, every day it receives about ...
-1
votes
0answers
11 views
Whatever happened to gdiff (IRIX)
I miss SGI systems. I loved gdiff (graphical diff). What would be the best RHEL tool to do a graphical diff of two text files?
0
votes
0answers
14 views
Why does WDiff have issues with text extracted from Google Docs PDF?
I'm working with an OCR program for PDFs. As part of the program, if the PDF has already been OCRd, I extract the text with Apache Tika. Then I compare that text to a sample of "perfect" text from ...
0
votes
3answers
31 views
unix diff side-to-side results?
How can I plot the results of a unix diff command side-to-side instead of one difference after the other? See below for an example:
diff /tmp/test1 /tmp/test2
1,4c1,2
< asfdsadf
< ...
2
votes
1answer
28 views
Unix Diff command compare difference between 2 txt files and generate more command [closed]
I have created a script, which will generate a list of IPs and then put them in the name of "ip-$date.txt". for example, ip-20130619.txt. Tomorrow it will be ip-20130620.txt
Now I need to create ...
0
votes
0answers
28 views
Tool/Library (Linux/Python/Ruby/Java) to analyze diff/patch by rules
I'd like to analyze patch/diff output for the changes that were made to the code. At best without needing the original file.
What I want to do is to detect if some kind of changes happened to the ...
1
vote
1answer
20 views
Git commit diff show line update in only one line
I know that by using the commands
git show / git diff
I can get the line changes, nevertheless they print line modifications as a + line preceded by a - line. I recall finding somewhere an option ...
0
votes
1answer
24 views
SVN: automatically check revisions ahead and see if it's possible to merge without conflicts
I have an important question I wasn't able to find anywhere:
I have an svn working copy in my disk with a certain revision, for example 1500, and it's a lot below the HEAD revision, for example 4500.
...
0
votes
1answer
15 views
Git diff creating empty patch when using external difftool
I'm trying to create a diff file (patch) between two commits. I'm trying the command
git diff 62fe9db 7661a06 > ~/Desktop/patch
but the file created is empty. When I run the above command, ...
1
vote
2answers
47 views
Find differences between a list of dictionaries
I need to get a difference between multiple dictionaries inside a list. What I have:
[{'WWW': '1.1.1.1', 'Dom': '1.1.1.1', 'SPF': None, 'MX': '1.1.1.1', 'PTR': 'reverse.dom.com'},
{'WWW': ...
1
vote
3answers
31 views
Revert one change from the diff
Before committing, I see with git diff that I've made a change that I would rather not have made. Is there any way to revert this single change?
I suppose that I could use git add -p to commit the ...
