I staged a few changes to be committed; how can I see the diff of all files which are staged for the next commit? I'm aware of git status, but I'd like to see the actual diffs - not just the names of files which are staged. I saw that the git-diff(1) man page says git diff [--options] [--] […] This form is to view the changes y...
hello, I have snapshots of multiple webpages taken at 2 times. What is a reliable method to determine which webpages have been modified? I can't rely on something like an RSS feed, and I need to ignore minor noise like date text. Ideally I am looking for a Python solution, but an intuitive algorithm would also be great. Thanks! ...
I want to configure it so that svn diff filename shows the diff in beyond compare. I am on ubuntu. On a related note what is everyone using to diff and merge. BC is awesome on windows, but very ugly looking on Linux, imo. ...
I have two MySQL databases and I would like to write a script to compare and update data changes between them. Does anyone know a Linux command line tool for diffing or patching data in MySQL databases? ...
svn diff --summarize shows the changes at the file level for a commit. Output it something like: M modified-foo.bar D deleted-file.bar A new-file.bar Similar to svn status, but for commits. I would be happy with output similar to git status, but for a particular commit instead of the working copy. I know I could fire up gitk...
First, let me begin by telling you the details on the problem I'm trying to solve. We have a third party application that uses Xml Documents to store all of it's business logic and look up tables and such. The application has a base set of Xml Files, and uses a kind of inheritance model to expose inherited Xml files that we're to edit t...
Is it possible using any sort of diff utility to diff based on filename only, ignoring all folders and subfolders? So if I have /folder_1/a/1243.txt and /folder_2/b/1243.txt or /folder_2/1234.txt It would match the files when doing a diff between folder_1 and folder_2? ...
Have two folders with approx. 150 java property files. In a shell script, how to compare both folders to see if there is any new property file in either of them and what are the differences between the property files. The output should be in a report format. ...
Hi I have a .diff file but I don't know how to open it. I trie using FileMerge but that doesn't give me an option to open a .diff file. Any ideas? Thanks. ...
Hello, I am looking for a binary diff tool which allows me to mask parts of the binary files so they won't be taken into account. The challenge I am facing is the following: Once we finished actively developing a branch of our embedded software we put it into maintenance. This means it is still build once a week to ensure that it doesn...
I made some changes in the sourcecode for a project hosted on codeplex. I'm not an author or editor on the project - just a user. But I'd like to submit the changes as a patch. Codeplex has a nice way to do upload the patch... How can I generate a patch or a diff, from within Visual Studio? How can I generate something that another...
I have a large complicated function that was ported from C++ to C#. I would like to perform a diff to see exactly what has changed between the two. Other can manually copying each of the functions to 2 temporary files oldFunction.cpp and newFunction.cs and diff-ing those is there another way? ...
If I have a diff that has paths like these: --- a/b/foo/bar/baz.pl +++ c/foo/bar/baz.pl Is there a way to tell the patch utility that the diff roots are at different levels? i.e. -p2 for one, yet -p1 for the other. Or is there any alternative utility that will patch in such a case? ...
I need a tool for comparing and merging two xml-files. Requirements Handle large Files (> 50mb) Collapse XmlNodes in UI Support validation of files merge files in both directions edit files in ui Any suggestions? ...
Hi, did you find a way to display differences between two htmls?? Im telling you I need to get this but I cant find a way to do this. There is a php class called daisdiff but it has no documentation at all whatsoever... Please if you already implemented an alghoritm on some of your projects, pleas elet me know and five me some advice. ...
Hi everyone, I'd like to use 'diff' to get a both line difference between and character difference. For example, consider: File 1 abcde abc abcccd File 2 abcde ab abccc Using diff -u I get: @@ -1,3 +1,3 @@ abcde -abc -abcccd \ No newline at end of file +ab +abccc \ No newline at end of file However, it only shows me that were...
I need to generate a patch of commit with respect to its base. A tag has been marked on that commit. So like on 939023 I do a commit and now it becomes 213232, I will tag 213232 with a label. Now given the label, I need to find out the diff between the 213232 and 939023. I mean I need a way to generate a diff of any commit whose label i...
I would like to check diffs and when files are not same,stop compare files. Compare any files C:/UML/reports/* and C:/UML/Test/*. In this two directory has same file names and also aim is to want to compare same file by name. I try to that by below code in .bat file. diff.bat @echo off for %%i in (C:\UML\reports\*) do comp %%i C:\UML...
Hi. We've recently "upgraded" from Visual SourceSafe to SVN based on recommendations on this site. Our current source control set-up is: TortoiseSVN with VisualSVN. We're very happy with it so far, but I was wondering if there's any additional benefits from using a different diff/merge tool than the one included (TortoiseMerge). Tortois...
I'm trying to use bsdiff (or any binary diff implementation you come up with) to compute and apply diff onto random binary data. I would like to use it on data from a database, so it would be better not to have to write those onto disk and pass them to bsdiff.exe. Is there any wrapper library or way in python to do that? ...