Is there a useful command-line diff utility for VSS 2005?
I tried this but if wants to compare my current directory with, it seems, some randomly picked path from the project.
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. What I need is an output as a comprehensive report ( XML , HTML ) suitable for parsing so that I would be able to show similar…
How do I diff two files in MSBuild? I cannot find any specific task to do it.
If possible, is it also possible to exclude certain rows, or patterns in the files eg.
2009-12-09T10:03:07.6888125+02:00
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 currently…
Anyone know of any pre-existing tools out there what will highlight differences in output when running Django tests?
I'm comparing some JSON output and it's tough to find things like extra spaces. I was about to just copy and paste this into an existing diff tool but I figured this might be on someone's radar.
I made some changes to an open source project without taking time to create proper patch files.
Now, the maintainer of the project released a new version, and among new and edited files, there are a bunch of renamed files.
Whats is the best way to apply my changes to the new version ?
I'm completely new to diff/patch use, and If I can get it…
I am currently developing a java program where I need to show the difference between two text.
Is there any library available for visually show the difference, that is the diff output in my java program or how can I do so. Any suggestion will be very helpful for me.
We have some directories that are tracked in both CVS and SVN (loooong story). When I change a file in one of these and run meld it diffs it against the SVN version. However for some of the other developers it diffs against CVS. Is there a way to specify which one gets priority?
Everyone is using Meld 1.3.0
I do something like "svn diff /mystuff/current.diff". I want to view this .diff file with syntax highlighting.
jEdit does it, but it's a huge beast and it takes a while to start up. I want something lightweight/native.
Smultron/Fraise, TextWrangler, TextEdit, Dashcode don't seem to highlight .diff files.
FileMerge seems to want to…
We have a lot of spreadsheets (xls) in our subversion repository. These are usually edited with gnumeric or openoffice.org, and are mostly used to populate databases for unit testing with dbUnit. There are no easy ways of doing diffs on xls files that I know of, and this makes merging extremely tedious and error prone.
I've found…
I'm looking for a diff tool that will allow me to compare just a sub-section of a file with a section of another file, or even of itself. Preferably eclipse based but will take all suggestions.
Yes I know I can copy out the two sections into different files and compare those, but that is very tedious when you are trying to do a…
Hi,
I'm looking for a diff implementation in Java. I've seen that Python has its own SequenceMatcher (with difflib), which is exactly what I need... in Java.
Is there any portage? Or is there any other class/library that performs the same in Java?
If not, where can I find the source code of that difflib (if free as in speech)…
Basically, I am looking for something equivalent to cvs diff -D"1 day ago" -D"2010-02-29 11:11". While collecting more and more information, I found a solution. I paste it here, for others that might have similar problems.
Things I have tried:
In git, how can I get the diff between all the commits that occured between two…
The options for source code diff viewing/editing/merging seem to be:
Free:
Tortoise Merge
Meld *
WinDiff
WinMerge *
DiffMerge *
KDiff
AJC Diff
Commercial:
Total Commander's Diff viewer *
Beyond Compare *
Delta Walker *
Araxis Merge *
Are there any other options? (Wikipedia suggests a few)
What's your favorite…
I have succeeded in getting git to start Beyond Compare 3 as a diff tool however, when I do a diff, the file I am comparing against is not being loaded. Only the latest version of the file is loaded and nothing else, so there is nothing in the right pane of Beyond Compare.
I am running git 1.6.3.1 with Cygwin with…
I have two identically sized files and I need to do a binary diff to check whether they're the same.
I'm currently runnnig diff file1.img file2.img but it's taking quite a while to process my 4GB files. Is this the most efficient way to do this?
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…
http://diffplex.codeplex.com/
I am looking at the samples provided. In these samples for the long lines they are trying NOT to wrap them which leads to horizontal scrolling.
I believe, it should be possible to show those lines wrapped inside cells. In my scenario for left and right strings as input, after…
Suppose I have two documents that are identical except the lines are shuffled. Is there a tool that can show me which lines in document A correspond to which lines on document B by drawing lines to connect them (kinda like Cairo does for machine translation word alignments)?
What if the files have some…
In this post I asked if there were any tools that compare the structure (not actual content) of 2 HTML pages. I ask because I receive HTML templates from our designers, and frequently miss minor formatting changes in my implementation. I then waste a few hours of designer time sifting through my pages…
I am building certain GUI in C# for a content manager and looking for the tools or code snippets or open libraries ( code ideally in C# ) which allow me the following :
1. For table A in database X (test ) and table A in database Y (production) and for a simple filter ( e.g. listname = "XYZ" ) I…
I have two tables, with the same structure, for example: table "first' with columns 'a','b','c' and table 'second' with the same columns. How to find difference betweet those two tables?
Of course, I can make some script on python, that will make set(a)-set(b), but I think there is some way to do…
I have two text files with several sections in them. Each section has has a header with the section name (grep can extract all the section names without extracting anything else from the file). How can I report the differences between the two files AND report the section that the difference…
In Eclipse, I am using a TreeViewer to show a custom tree, whose contents are drawn from an ITreeContentProvider. Now I am trying to create a second view that allows me to automatically show a two-way comparisons of two such trees. I found various views for textual comparison within Eclipse,…