I have a source file with two similar yet subtly different sections. I'd like to merge the two sections into one subroutine with a parameter that handles the subtle differences, but I need to be sure I'm aware of them all so I don't miss any. What I usually do in such cases is copy each of the sections to a separate file and then use tk...
Hello, I have something like this src/sim/simulate.cc 41d40 < #include "mem/mem-interface.h" 90,91d88 < dram_print_stats_common(curTick/500); < src/mem/physical.hh 52d51 < public: 55,56d53 < public: < 58a56,57 > public: > 61,62c60,61 < virtual bool recvTiming(PacketPtr pkt); //baoyg < --- I believe th...
Does standard/normal diff format exist in svn or only unified format? ...
What are some of techniques good for detecting if a webpage is the same? By same, I don't mean char-for-char equivalent (that's easy), but is robust enough to ignore something like a current date/time on the page, etc. E.g., go a Yahoo! News article load the page, open the same page 10 minutes later in another browser. Baring rewri...
I'm looking for a good free 3-way Merge/Diff tool for Windows. I know of KDiff3. But I was looking for further recommendations. ...
I have two XML files. They are similar, but there are two nodes of which either of the file have only one. I want to merge two sets of such documents in one single document where first the node of side A is taken, followed by the nodes of side B. I'm not an experienced user of diff tools and downloaded KDiff3 to start somewhere.. Can an...
Hello all, Is there any way using diff to show differences only in lines that include an specific word?. Thank you. ...
I need to match up two almost-the-same long freetext strings; i.e., to find index-to-index correspondences wherever possible. Because this is freetext, the comparison should not be line-based as in code diffing. Any suggestions for Java libraries? A simple example (In real life , of course, there would not be extra whitespace to lin...
I'm very happy of Netbeans 6.5 diff tool, I have to ask some questions about it: which is its name? there's an equivalent for eclipse? is there any standalone version (without netbeans)? Thank you very much!! Valerio ...
I tried running 'diff' against two source directories get a patch file with a 'diff' between the two directories. diff -rupN flyingsaucer-R8pre2_b/ flyingsaucer-R8pre2/ > a.patch The command above does not seem to work, it generates a diff of everything and I get a 13 MB file, when in reality, it should be a couple of changes. ...
Eric suggests that you read your team's diffs every morning. Can I get TFS to automate this in some way? Ideally I'd like an email with all of the differences in, but I'd settle for a link to each of the commits. ...
I have my editor setup to be textmate but when I do a git diff it uses vi to show me the diff output, is there any way to set it to show the diff in textmate? ...
diff fails as the assembly listing is filled with slightly different labels. ...
We have an ORACLE 10g database with 100+ tables. The software used against this database is an order entry system. We are looking for some software (preferably free) or script which when ran will tell us which tables had a new row INSERTED or any data UPDATED....after we have generated a new 'order' from within ... Also which sequences...
I found a great article on integrating different diff and merge tools with Visual Studio 2005 and 2008: http://blogs.msdn.com/jmanning/articles/535573.aspx. Does anyone know how I might integrate a tool like KDiff3 in the same way with Visual Studio.Net 2003? I would like to have KDiff3 be the default diff tool when I use the "Compare V...
There are plenty of programs out there that can create a diff patch, but I'm having a heck of a time trying to apply one. I'm trying to distribute a patch, and I got a question from a user about how to apply it. So I tried to figure it out on my own and found out that I have no clue, and most of the tools I can find are command-line. ...
In podcast 40 one of the things mentioned was checking the difference between files in source control to see what was done the day before. Are there any good external tools - something I can open all by itself - that will show the diff on everything changed since the last check-in or within a given time frame on a single project? We'r...
In Word, there is an option to compare two documents and find out the differences between the two documents. I'm looking for a similar function to compare two Powerpoint documents. Ideally, it would list the individual slides that are different, the differences in each slide between the versions and when the changes were made. However, I...
Bizzaro-Diff!!! Is there a away to do a bizzaro/inverse-diff that only displays the portions of a group of files that are the same? (I.E. way more than three files) Odd question, I know...but I'm converting someone's ancient static pages to something a little more manageable. ...
I'm trying to find some good examples of semantic diff/merge utilities. The traditional paradigm of comparing source code files works by comparing lines and characters.. but are there any utilities out there (for any language) that actually consider the structure of code when comparing files? For example, existing diff programs will re...