If I make a simple diff in git with e.g.: git diff origin/master where can I find good references on how to read the output of git. The man page on git-diff is rather long, and explains many cases which are maybe not necessary for a start. ...
There's another question: howto make diff look like svn diff? but I want the exact opposite. I'm trying to get svn diff to display with < and > The obvious answer would be: svn diff --diff-cmd /usr/bin/diff file but when I do that I get /usr/bin/diff: illegal option -- L So I do this svn diff --diff-cmd /usr/bin/echo file t...
I need to generate a changelog of sorts between two Tags within a project controlled using git. Specifically the android source code. This list should include any files/directories/etc which have been edited, moved, renamed, deleted, created. Any help would be great. and if you have a way to do this over the entire android source at once...
I like to view the current differences in the source files I'm working on with a command like: vim <(svn diff -dub) What I'd really like to be able to do is to email that colorized diff. I know vim can export HTML with the :TOhtml, but how do I pipeline this output into an html email? Ideally. i'd like to be able to send an html dif...
I'm wondering if there is a way to create a diff of a repository that you've checked out and save it to a diff file so that you can contribute it to a project as a full patch. I'm using Tortoise SVN, but if it has to be at the command line, that's OK too. ...
We use both Examdiff and Kdiff3 to view Mercurial changes. Just add this to .hgrc: [extdiff] cmd.kdiff3 = cmd.examdiff = C:\Program Files\ExamDiff Pro\ExamDiff.exe And then you can type hg examdiff or hg diff3 to see a complete diff of all your changes. What I would like is to do the same to see a "before and after" of files for a...
I know how to view all changes in a changeset.. But let's say you update your source, you do a pull and you get 3 new changesets. How can you compare the current state of the remote repository (with the 3 changesets checked in) vs. the current source (on your local machine)? I'd like to do this using the visual diff tool which I cur...
Does anybody know of a diff-like tool that can show me the changes between two text files, but ignore changes in whitespace including newlines? Here's an example: the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the lazy bear. the quick brown fox jumped ov...
I'm looking for a PHP library that will provide me inline diffing between two strings, like this: http://grabby.info/dfe2835f606443757ae7c18404e71781.png. I'm using xdiff currently, but it's crossing out the entire line when a single word changes, and that's not what I want. Any suggestions? ...
I need to create a patching routine for my application, it's really small but I need to update it daily or weekly how does the xdelta and the others work? i've read around about those but I didn't understand much of it the user shouldn't be prompted at all ...
I am not interested in any auto update solution, such as ClickOnce or the MS Updater Block. For anyone feeling the urge to ask why not: I am already using these and there is nothing wrong with them, I would just like to learn about any efficient alternatives. I would like to publish patches = small differences that will modify existing ...
Hello, My question is quite simple and with the SharpSvn Api, it should be easy as well. Here what I did: path = "c:\project"; using (SvnLookClient client = new SvnLookClient()) { SvnLookOrigin o = new SvnLookOrigin(path); Collection<SvnChangedEventArgs> changeList; client.GetChanged(o, out changeList); // <-- Exception } ...
We are currently using DeltaXML in our .Net application to analyse two versions of .xml files regarding their differences, but since DeltaXML is a java application/library, we're looking for a more homogeneous way to accomplish that task. Does anyone know a .Net diff library similiar to DeltaXML? ...
The linux file command does a very good job in recognising file types and gives very fine-grained results. The diff tool is able to tell binary files from text files, producing a different output. Is there a way to tell binary files form text files? All I want is a yes/no answer whether a given file is binary. Because it's difficult to ...
I have a List of Java objects on my server which is sent to the client through some serialization mechanism. Once in a while the List of objects gets updated on the server, that is, some objects get added, some get deleted and others just change their place in the List. I want to update the List on the client side as well, but send the l...
Here is my use case: I start on a project XYZ, for which I create a work item, and I make frequent check-ins, easily 10-20 in total. ALL of the code changes will be code-read and code-reviewed. The change sets are not consecutive - other people check-in in-between my changes, although they are very unlikely to touch the exact same file...
Command line or library "compare tables" utility for SQL server with comprehensive diff output to a file in .Net I can't find anything like that. Commercial or free ( XSQL Lite is suitable for my case and ) tools show diffs in grids with possibility to export to CSV. Also they generate sync SQL scripts when run from command line. Wha...
I have two almost similar source code trees, but do not have access to the source code repository so I am stuck with release packages that contain also test reports, documentation, binaries etc. the diff command only support --exclude, but I would like to do something like diff -wbur --include='*.c,*.h' tree1 tree2 I know that this que...
I've tried adding merge=kompare to my ~/.hgrc, but when I run hg merge, it runs kompare, but there's no UI to be seen. Hg says merging path/to/first-file and stays there, actionless. ...
I have code in subversion. Recently the way the code is structured was changed from this: root/source-here to: root/folder 1/source-here root/folder 2/other stuff I went ahead and made a diff using Tortoise SVN but I didn't get what I expected. Basically all files (modified and new) are shown as added and all folders of original ...