Here's what I have in my Mercurial.ini ... [extdiff] cmd.bcomp = C:\Program Files\Beyond Compare 3\BCompare.exe opts.bcomp = /leftreadonly So, the extdiff extension is working fine except that even when one side of the comparison is my working directory, as in the case where I only give one revision argument, e.g. hg bcomp -r 25 to g...
I'm trying to patch HtmlUnit with the patches at the bottom of this page. I can see how to apply patches from Eclipse, but I can't figure out how to apply these particular patches. I had the JARs initially, but then I realised I'd need to source, so I obtained those, but still no luck. In the patch I see: --- a/htmlunit/src/main/java/...
I unadvertedly change the permissions of my entire tree and commit that change alone with other content changes. I use something like : tar -czf deploy.tar git diff --name-only v1 v2 to generate a tar with the modified files between two tags, the problem is that now because of the permissions change almost all my tree is listed as mod...
Hi, I would like to integrate Beyond Compare with ClearCase so that I can use it for diffing and merging files, instead of the awful tools provided by ClearCase. Does anyone have instructions for performing this integration? Thanks, Don ...
In short I am looking for something like google-diff-match-patch in PHP. I have had a look at some similar questions at SO, and also at the algorithm provided here, but all of them fail: diff("draßen", "da draußen") should not give <del>draßen</del> <ins>da draußen</ins> (which is kind of stupid for my purpose, because I want to...
I using a vendor modified version Linux which is based on a 2.6.14.* (more specifically than that, I don't know which) version of the kernel. I'd like to forward port the vendor kernel changes, but first it makes sense to me to see what changes were made. I've cloned the linux git repo: $ git clone git://git.kernel.org/pub/scm/linux/...
Hi, I am looking for a way to generate regex from based on the differences between 2 input strings. The regex can then be used to match the 3rd string that is also similar to the 2 input strings. For example, given 3 strings: f1, f2, and f3 f1: 111xxx222 f2: 111yyy222 f3: 111zzz222 I am wondering if there is a generic way to ...
Hi, I would like to take the diff of two source code files, but I don't want it to report any differences for lines that only contain a programming language comment. The types of comments I would like it to ignore are: // ... # ... /* ... */ ...
Hi all, I'd like to create a dynamic view that only shows the files a user created/modified for a particular label. Right now, I am listing all of the files in the label and comparing that with the previous label. If I have to use cleartool to find the files, that is fine with me. I'd like the process to be more automated than it cur...
diff usually produces rather clueless output. Here's a good example. If we start with this: class World def hello puts "Hello, world" end def goodbye puts "Goodbye, world" end end Drop the second method and change the first: class World def hello puts "Hello, #{self}" end end diff -u will be a total mess - s...
I have 2 branches that I can compare/diff using my difftool (Beyond Compare). However, the files used for the diff are temporary copies and not the actual files from the current branch. This means that if I want to make a change to an existing file, I cannot do it via the difftool. I would need to make a copy of the files of one branch, ...
Two questions: How to make the TortoiseSvn diff tool ignore the EOL style? How to fix mixed EOL style files during the conversion from PVCS to SVN? I've just imported a PVCS archive to Subversion using the excellent free Polarion conversion tool. Everything looks fine, there is just one annoying thing that I'd like to fix. Some of th...
I have a CSV file containing some user data it looks like this: "10333","","an.10","Kenyata","","Aaron","","","","","","","","","","" "12222","","an.4","Wendy","","Aaron","","","","","","","","","","" "14343","","aaron.5","Nanci","","Aaron","","","","","","","","","","" I also have a file which has an item on each line like this: a...
Hi. I've been working on integration-tests for a Java web service. The integration test now sends SOAP-requests to the server which are asserted via the SoapUI-plugin and for each of the SOAP-requests an xml file is produced and saved (a part of the integration-test phase). Is there a plugin that allows me to diff the xml files that ha...
I have a set of patch files, which include newly created files. Is there a way to tell patch to create those files or do I have to touch each one manually? ...
When viewing a diff using git diff, each change starts with line like: @@ -28,41 +20,10 @@ namespace ConsoleApplication1 For C, the final part is quite descriptive – it shows for example the function in which the change occurred. But for C#, it only ever shows the namespace, which isn't very useful. I think that's because it shows las...
This has always lingered in the back of my mind, so I figure I might as well go ahead and ask. How does a wiki handle multiple edits on the same content? Here's a simplistic example of what I'm asking. Let's say that a page has the following content: I'm a page! And now let's say that two go to edit that page. Each person adds a ...
I've used many of the diff tools listed here. What I haven't found is one that has good reporting tools. The changes to our software baseline that will be reviewed at a change control board. I am looking for a diff tool that will produce a report of differences that can be viewed by the review team using a common file format (pdf/w...
Hi, I'm looking for an open source version control tool which can diff and merge XML files. The difficulty I have to find such a tool is, that I need a correct merge of a XML file comparing the nodes and not the lines. Any idea? Thanks! ...
I'm looking for an SVN diff tool which can ignore comments as changes, as well as exclude specific revision diffs for easier file comparison. For example, see below. Version 1. This is a sentence Here is an address What's going on here Version 2. 1 This is a sentence 2 Here is an address 3 What's going on here Version 3. //added ...