Hi, We're using MS Visual Studio 2008. TFS seems to take into account the creation date of a file or something, to determine whether the files should be committed. Is it possible to make TFS test just on the filename and content? I check out an xml or txt file I copy the content I open notepad and paste I save the file using the s...
I want to compare side by side some C files with kdiff3 (the tool is what matters the less), but some parts have been "reformatted" in one of the files, thus giving false positives in the differences. Kdiff3 allows you to run a preprocessor on the input files, and I thought that using "indent" (or similar tools like astyle or uncrustify...
Is it possible to get the git difftool command to open a directory compare between the changed files and the staging/checked files? So ideally, if 2 files have changed, they would be the only 2 shown, but within a directory compare. I've read posts about getting git to give all file diffs in parallel, so tools like BeyondCompare has al...
I want to provide a diff report for a non regression test. My program is Java based but I did not found any API filling my needs. So I'm using an external tool (CSDiff) that take 2 files as arguments and return an HTML report. That's nice and easy to setup. Now the only problem I have is that the HTML report needs some tweaks to be use...
I use mercurial and I want to see modified change in Vim or GVim. Normally there is hg diff which show the modified changes in diff format. but I want to see it in Vim as the original version and modified version side-by-side. I try extdiff in http://mercurial.selenic.com/wiki/ExtdiffExtension but it doesn't work and gvim open some blan...
Currently I am using google-diff-match-patch to implement a real-time editing tool, which can synchronize texts between multiple users. Everything works great when operations are only plain texts, each user's operation(add/delete texts) could be diff-ed out by comparing to old text snapshot with the helper of google-diff. But when rich f...
Is there a diff algorithm that does not group unrelated blocks? For example: hello world lorem ipsum dolor sit amet vs. Hello World Lorem Ipsum Dolor Sit Amet Comparing these (e.g. with standard Unix diff) generally results in the following: < hello world < lorem ipsum dolor sit amet --- > Hello World > Lorem Ipsum Dolor Sit Amet...
Using Visual Studio 2008 tools, I am trying to get an ASCII diff of change sets 14318 and 14317. I can do so using GUI: tf changeset 14318 and then select a file and right-click and select compare with previous version. However, this is a bit tedious and it is GUI-based. My task at hand is to back-port many changes into a different ...
What algorithms or Java libraries are available to do N-way, recursive diff/merge of directories? I need to be able to generate a list of folder trees that have many identical files, and have subdirectories with many similar files. I want to be able to use 2-way merge operations to quickly remove as much redundancy as possible. Goals...
I wonder if there are tools to show *.diff files used in patching related to debian packaging. What I need from the tool is that it could just read the diff file and show the actual files changed with changed rows, like kdiff or meld would do when comparing directly 2 different files. Or maybe I have totally wrong kind of approach to thi...
I'd like see a visual diff of a branched file. So I do this p4 diff2 -b branchname main.cpp One problem... it's not visual and external diff isn't supported. http://www.perforce.com/perforce/doc.current/manuals/cmdref/diff2.html p4 diff2 does not use the diff program specified by the environment variable P4DIFF. The diff algorithm ...
EDIT: I'm not sure that my original question is clear enough. I need an algorithm that will compute the minimal sequence of moves to rearrange an array from one order to another. It is known that both arrays will contain the same elements (no duplicates) and have the same length. For example: reorder( ['d', 'a', 'c', 'b', 'e'], [...
I want to be able to do a 3-way merge of XHTML documents: Start with some original copy of the document One user edits a copy of the original document Another user edits a separate copy of the original document Need a tool to merge (automatically and/or visually) the changes made by the two users. Note: I want to include this funct...
Title really says it all. There is the -O option for opening splits vertically, and -o for horizontally, but trying to mix them doesn't seem to work. My goal is to use g/vimdiff for 3-way file merging in mercurial in a way more like kdiff3 does. This method would have the 3 files to be merged split into 3 vertical tabs across the top ...
I am in the process of writing a diff text tool to compare two similar source code files. There are many such "diff" tools around, but mine shall be a little improved: If it finds a set of lines are mismatched on both sides (ie. in both files), it shall not only highlight those lines but also highlight the individual changes in these l...
I am trying to create an ANT build script which will detect which files were changed during the development (by diff SVN command) and output the list of files which are built from these changed files. I would like to check all the Concat tasks within the build file and compare the filelists within them with the diff changed files list c...
Hi. I want to do a Diff between a locally commited change and between the SVN commited last change. i.e. HEAD and what is on SVN Master trunk. what would be the suitable command? Cheers ...
The ever-helpful Wikipedia claims that diff implements Longest Common Subsequence. This cannot be so. Diff, at least in -y mode, has three types of report: add, remove, and substitute. LCS does not have any concept of 'substitute'. What is the algorithm of diff? I have reason to not believe that it is Levenshtein distance, but I might ...
Is there a way to find the differences between the trunk and say a branch 0.4.x? I need to create a tag - however I can't remember if my latest corrections were done in the trunk or the branch. ...
Hi, I was wondering if anyone could help me with the following. I work remotely with other software developers on the same project. I use subversion and tortoise to manage my code. I don't think the other developers do the same. This creates problems when we try and share code, because we have to figure out which files were modified so ...