diff

Following a blog, I created a batch file, wm.bat: "d:\svnroot\external\winmerge\WinMerge.exe" /B /WAIT "d:\svnroot\external\winmerge\WinMergeU.exe" /e /ub /dl %3 /dr %5 %6 %7 And I tried calling svn diff | wm but that didn't work. So how do I integrate WinMerge or similar utility with svn diff ? Extending on David's answer below, changing the default for Windows requires editing the configuration file located at (for Windows XP) C:\Documents and Settings\%USERNAME%\Application Data\Subversion\config or (Windows Vista) C:\Users\%USERNAME%\AppData\Roaming\Subversion\config David Dean Ok, looking

It seems SVN's "patch" functionality is not exactly what I want. What I really want is to create a diff of files between revisions. So, I'd choose rev1 and rev 2 and end up with a folder containing all files that were changed or added between those revisions. Can this be done with Tortoise SVN or plain-old svn? This can be achieved in tortoise SVN itself. Right click on the branch(folder) from where you want to create the patch >> Show Log >> Select All the revisions for which you need to create the patch >> Right Click and select Compare revisions >> This will show the changed files >> Select

I'm somewhat new to Git and what I'm trying to do seems like it should be possible. Basically I've been working off of clone of a repo and have made quite a few local commits. Is there a way to see the diff of the 'sum' of all my changes and the original repo version? I would assume this would be possible because Git will essentially do this when I do a push . Here is an example of what I'm trying to do: in gitk I will see something like this: * - [mybranch] Added '42' to end of answers.txt (local commit) * - Added 'Hello World' to end of my.txt (local commit) * - Added 'C#/.NET' to beginning

Possible Duplicate: Git Merge: What does this mean? Git diff --stat explanation Sorry for the stupid question, but i can't find a clear answer anywhere. When you merge two branches in git, you get an output like that : some_file.txt | 564 ++++++++++++++-- I undestand that + and - mean addition and deletion, but : what does the number of signs represent ? when you have few changes, each sign seem to represent a line, but when you have more signs, i can't get the logic of the representation is it some sort of percentage of changes ? My guess is that the number of signs represents a relative

Let's say you have two instances of the same bean type, and you'd like to display a summary of what has changed between the two instances - for example, you have a bean representing a user's settings in your application, and you'd like to be able to display a list of what has changed in the new settings the user is submitting (instance #1) versus what is stored already for the user (instance #2). Is there a commonly used algorithm or design pattern for a task such as this, perhaps something that can be abstracted and re-used for different types of beans? (I'm having a hard time thinking of a

I want to perform a three-way diff between two git branches with a common merge base, and view it with kdiff3. I've found lots of guidance on SO (and a few very similar questions ( 1 , 2 , 3 ) ) but I haven't found a direct answer. Notably, a comment on this answer implies that what I want is possible, but it didn't work for me. Hopefully that user might chime in here :) For background, when I perform merges I use a "diff3" conflict style: git config --global merge.conflictstyle diff3 And I have git mergetool configured to use kdiff3. When resolving merge conflicts this shows me four files:

I want to compare 2 text values on a web page and highlight the differences. Can I do this client-side, preferably with jQuery or Prototype? This diff-patch-match library appears to do a really good job: http://code.google.com/p/google-diff-match-patch/ The project has JavaScript, C#, C++, Python, and Java implementations that all do the same thing. Check out the the wikEd diff library and the online tool and demo . The library creates inline text comparisons with block move highlighting and is character/word-based. It has been optimized for Wikipedia, but works equally well for other text