When I type 'git diff', I want to view the output with my visual diff tool of choice (SourceGear diffmerge on Windows). How do I configure git to do this?
Which is the best Visual SVN Diff displayer for Linux.
BeyondCompare and VisualSVN1.5 work well on Windows. What are the equivallent tools for Linux. Specifically Ubuntu.
I know command line diff works; But I'd like multiple column syntax highlighted and differences.
Better if the tool has a support for Git and Hg as well.
I have two almost similar source code trees, but do not have access to the source code repository so I am stuck with release packages that contain also test reports, documentation, binaries etc.
the diff command only support --exclude, but I would like to do something like diff -wbur --include='*.c,*.h' tree1 tree2
I know that this question is…
I'm wondering if there is a way to create a diff of a repository that you've checked out and save it to a diff file so that you can contribute it to a project as a full patch. I'm using Tortoise SVN, but if it has to be at the command line, that's OK too.
Is it possible? Run a cvs diff in terminal at the project root that outputs only modified files (like local files that aren't in source control and local modified files).
I'm running cvs diff --brief but I still have too many results since my project is large, and with a lot of subdirectories - it shows the whole hierarchy and I just want to…
I've got two partition images (A and B) and want to use them to create a patch that I can apply on A on another computer in order to get the new B image without flooding the network. I have the following requirements:
works on linux
can create diffs
can use diffs to patch files
can handle binary files
can handle large files (a few hundred…
For all my present Diff / Merge needs I'm using Beyond Compare; when I decided to buy a license for it I tried other similar tools, both payware and freeware.
Now BC is at version 3, and I think it's a great tool... but what are your experience in this field? Do you think there is something better? And what are the feature you like best on…
[Do you tweet? Follow us on Twitter @matthawley and @adacole_msft] We deployed a new version of the CodePlex website today. Pull Request Conversations Previously, the only way for project members and users who submitted pull requests to converse was via e-mail. This complicated the review process and made conversations isolated and…
Does python have any sort of built in functionality of notifying what dictionary elements changed upon dict update? For example I am looking for some functionality like this:
>>> a = {'a':'hamburger', 'b':'fries', 'c':'coke'}
>>> b = {'b':'fries', 'c':'pepsi', 'd':'ice cream'}
>>> a.diff(b)
{'c':'pepsi',…
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…
We use both Examdiff and Kdiff3 to view Mercurial changes.
Just add this to .hgrc:
[extdiff]
cmd.kdiff3 =
cmd.examdiff = C:\Program Files\ExamDiff Pro\ExamDiff.exe
And then you can type hg examdiff or hg diff3 to see a complete diff of all your changes.
What I would like is to do the same to see a "before and after" of…
(git version 1.6.5.7)
When I run git diff the output has a nice scope hint after the line numbers for my Python scripts, e.g.:
diff --git a/file.py b/file.py
index 024f5bb..c3b5c56 100644
--- a/file.py
+++ b/file.py
@@ -14,6 +14,8 @@ TITF: Test Infrastructure Tags Format
...
@@ -1507,13 +1533,16 @@ class Tags( object ):
...…
(Appologies for the poor title. I'm open to suggestions for a better one. "Language-gnostic", perhaps?)
Does there exist a diff utility (preferably *nix-based) that will diff files based on how a (selectable) language compiler would view the code?
For example, to a Python compiler, these two 'graphs are identical:
# The…
I'm looking for a diff equivalent written in JavaScript that only returns/prints relevant lines. I don't want both full text displayed next to each other with the differences highlighted, but just want the actual differences (plus some buffer lines to know where the difference is), similar to the output from the linux diff…
I've been busy refactoring a file in our project and as part of my changes I reordered the function to a more logical way. However, now when I'm trying to review my changes I get a mess: The diff applications has no idea that the functions were merely reordered and marks 80% of the file content as changed.
I've tried to…
I have a collection of objects of the same type, let's call it DataItem. The user can view and edit these items in an editor. It should also be possible to compare and merge different items, i.e. some sort of diff/merge for DataItem instances.
The DIFF functionality should compare all (relevant) properties/fields of the…
Hello,
idea
I would like to create a little app for myself to store ideas (the thing is - I want it to do MY WAY)
database
I'm thinking going simple:
id - unique id of revision in database
text_id - identification number of text
rev_id - number of revision
flags - various purposes - expl. later
title …
Greetings P4 folks,
I am trying to understand the P4 describe -ds output. I am assuming that this is the same as the p4 diff -ds output.
Here is an example of the "Differences ..." block:
==== //depot/Groups/mygroup/trunk/main/FooBar.java#5 (text) ====
add 7 chunks 13 lines
deleted 1 chunks 1 lines
changed 16 chunks…
Does anyone know where can i find an explanation and implementation of the diff algorithm. First of all i have to recognize that i'm not sure if this is the correct name of the algorithm. For example, how Stackoverflow marks the differences between two edits of the same question?
ps: I know C and PHP programming…
Is there a way to get the changes of two commits with mercurial?
The second commit is not directly after the first one, there are some other ones between them.
I tried
hg diff [some params] --change xxxxx --change yyyyy > file.patch
but that only includes the last changeset.
If there is no way to achieve…
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.