Sometimes for example I change a word in line 100 and delete last 4 lines. When I run "git diff" It shows a log which has a -(minus) and +(plus) before all lines whereas I changed only mentioned lines. I thought it may be due to changing number of all lines but when I saw the changes again I didn't see any change to line numbers. so wha...
The scenario is that I have a MySQL DB on the server side, whose content is regularly updated/changed and I have 5-10 Linux clients... each of which would have a copy of the DB, and would need to have a significant portion of the DB in memory. I want to be able to get what version the client has, and then send the latest-updated data th...
Is there any diff tool for Lotus Notes which allows to compare scripts, design elements and documents? ...
Edited to make my requirements a little more clear I would love to find a decent web viewer similar to Trac's changeset page: http://trac.edgewall.org/changeset/10173. The only catch is that I need it to be pre-commit. These are for small changes that don't justify a branch/merge. Anyone know of such a tool? Must have: Must be pre-...
In a repository for a well known open source project, all files contain a version string with a timestamp as their first line: <?php // $Id: index.php,v 1.201.2.10 2009-04-25 21:18:24 stronk7 Exp $ Even if I don't really understand why they do this - since the files are already under version control -, I have to live with this. The ...
I'm looking for some tool to give me a recursive diff of two arrays. What I envision is a web page with two color-coded tree-structures. On each tree, green are parts of the array which match in both arrays, and red is for parts of each that don't match the other. Something like the output of dBug I have some code that gives me a nested...
Hi, I am using the very handy ediff-trees.el http://www.emacswiki.org/emacs/ediff-trees.el to compare two versions of a pile of Python code provided by one of my project partners. Unfortunately, these guys are checkin in code with trailing whitespace (extra tabs here and there...) which is creating a ton of false positive diffs, whic...
i want integrate a wediget about text compare to my web project,is there some easy to achieve this function,or some open source project easy to use? ...
When I do svn commit and let my svn editor pick it up I'd LOVE for the svn editor to show the diff of the files that have changed instead of just the list of files. Really helps jog the memory when writing detailed commit messages. Any ideas on how to accomplish? ...
I've been trying to figure this one out for a bit... I even downloaded MediaWiki and looked at their diff script, but I couldn't make heads or tails out of it. I am making a content management system, that will have revision history saved on it. However, revision history is pointless unless you can analyze the difference. I have very sim...
Sometimes, for whatever reason, I have to produce patch-files (under Linux) that are in the wrong direction. I know that I can deal with this by using the -R switch when applying it via patch, but it would be nice if there were a way of permanently reversing the patch-file. Is there a utility that can do this, or e.g. a regex that woul...
Hi, I am writing a C program. What I have seen from my earlier experiences is that I make some changes on a correct version of my program, and after that change, the program is computing incorrectly. Now, for one occasion it may be easy to detect where I made that change and undo it or do it in some other way, and for other occasions I...
I've got a Rails app with blog entries that I want to update from a separate Blog.git repo. I envision my workflow as something like: Write new blog entry Push to remote Git repo Call cap deploy:update, which will invoke a Rake task to update the database with any changed or new entries The hitch here is finding which files have cha...
The situation is as follows: it is necessary to merge in changes from an upstream code base (from V1, to V2), into a third code base S1 that is derived/branched from V1, to produce a new code base S2. We have access to version control for logs and revisions between V1 and V2, and the source of V1, V2 and the source of S1. However, S1 is...
I have PHP generated HTML. Firebug shows me this source: <div class="module-header"><div class="module-header2"><div class="module-header3"><h3 class="module-title" style="visibility: visible;"><span>Մարդկային</span> ռեսուրսներ</h3></div></div></div> Mozilla Source shows me another HTML for that part. <div class="module-header"><di...
Is there a utility that can do a diff between a set of files on the web and a set of files on the user's local hard drive? For example, if I execute: urldiff http://www.website.com c:\src Then I should get output like this: http://www.website.com/blue/test.html c:\src\blue\test.html [SAME] http://www.website.com/green/test2.h...
I have a patch file containing the output from git diff. I want to get a summary of all the files that, according to the patch file, have been added or modified. What command can I use to achieve this? ...
I want to use Tortoise SVN diff utility with TFS. I know how to configure user tools in TFS. What I need is installer for Tortoise SVN diff utility. I think I need to install full Tortoise SVN to get SVN diff tool, is there a standalone version of this tool available for download? I know various other diff tools are available like winMe...
I have to do checks between a development and release database and do this manually, which is both slow and not 100% reliable (I only visually inspect the tables). Is there a quick and easy way to compare table schemas automatically? Maybe even a feature that does this built right into SQL server? Edit: I'm comparing structure only, t...
Please resist the urge to tell me not to use c-shell. I'm writing a c-shell script and I need to run a diff between two files (generated in the script). How do I run diff and return its status (if it fails, return 1, else 0)? ...