What do people like for a code comparison (diff) tool ?
I've been using Beyond Compare but perhaps there is better.
I am on Subversion.
8  4369 
I use the built-in tool in Tortoise.
=== original message ===
from: John A Grandy
date: 18.07.2008 18:37
What do people like for a code comparison (diff) tool ?
I've been using Beyond Compare but perhaps there is better.
me2
I am on Subversion.
m2
The upcoming version 3 supports 3-way-merge. I'm beta testing BC and I'm
very happy with that in conjunction with Tortoise.
Cheers,
Udo
On Jul 18, 12:37*pm, "John A Grandy" <johnagrandy-at-gmail-dot-com>
wrote:
What do people like for a code comparison (diff) tool ?
I've been using Beyond Compare but perhaps there is better.
I am on Subversion.
Hi,
@ work I use the tool provided with VS2008 TFS.
@ home I use WinDiff , I have been using it for years :)
On Fri, 18 Jul 2008 15:53:15 -0400, "Larry Smith"
<no_spam@_nospa m.comwrote:
>What do people like for a code comparison (diff) tool ?
http://winmerge.org/
I'll second that vote for WinMerge. Fabulous tool, and open source,
too!
-Brent
On Jul 18, 8:37*pm, "John A Grandy" <johnagrandy-at-gmail-dot-com>
wrote:
What do people like for a code comparison (diff) tool ?
I've been using Beyond Compare but perhaps there is better.
I am on Subversion.
Araxis Merge is an excellent diff/merge tool, and integrates with SVN
directly (i.e. can compare and merge files and folder hierarchies
directly inside SVN repositories): http://www.araxis.com/merge/index.html
It's rather costly, though.
On Jul 18, 11:37*am, "John A Grandy" <johnagrandy-at-gmail-dot-com>
wrote:
What do people like for a code comparison (diff) tool ?
I've been using Beyond Compare but perhaps there is better.
I am on Subversion.
If you're already using Subversion why not use TortoiseSVN's diff
tool? That's what I use. This thread has been closed and replies have been disabled. Please start a new discussion. Similar topics | |
by: Charley |
last post by:
I've got a diff file that I think is a patch for a bunch of file in a
directory. How do I apply this file?
I thought it was
#patch myfile.diff
But that does nothing. I must be missing something. The diff file
contains diff's for a nuch of files, not just a single file. Do I need a
|
by: Luciano Cavallero |
last post by:
Hi,
I'm looking for a Diff utility for C++ class, able to
show differences two class in term of methow, properties etc.
I know that this is more complex that a common diff files because
need a reverse engeneer of the source files.
Do someoue know if exist a free tools that do a similar work?
Thanks.
|
by: sfsfsfsf |
last post by:
SchemaCrawler is a new schema diff tool on Sourceforge.
http://sourceforge.net/projects/schemacrawler
It can display the schema in a text format (plain text, CSV, or HTML),
designed for diff-ing. This is especially useful in diff-ing an older
and newer version of a schema. It is written in Java (platform
independent), and runs from the command line, or as an ant task.
|
by: Ching-Lung |
last post by:
Hi all,
I try to create a tool to check the delta (diff) of 2
binaries and create the delta binary. I use binary
formatter (serialization) to create the delta binary. It
works fine but the delta binary is pretty huge in size. I
have 1 byte file and 2 bytes file, the delta should be 1
byte but somehow it turns out to be 249 bytes using binary
formatter. I guess serialization has some other things
added to the delta file.
|
by: nickdu |
last post by:
Is there a tool that will merge XML documents? We also need the reverse, we
need to be able to create a Diff of two documents. What we're trying to do
is just store differences of documents at different levels of hierarchy in
our configuration store.
As an example, lets say at a certain hierarchy in our configuration store is
the following document:
<grid bgColor="Red" fgColor="Green" Width="200" Height="100">
<font name="Arial"...
| | |
by: Igor Shevchenko |
last post by:
Hi!
Suppose I have "pg_dump -s" of two pg installs, one is "dev", another is
"production". Their schemas don't differ too much, and I want to get a "diff
-u"-like schema diff so I can quickly add missing/remove old
tables/sequences/etc to one or another (manually). Is there some quick tool
for doing this ?
There was a thread about it sometime in aug, 2002, but it ended without
producing anything useful.
|
by: Andreas Kasparek |
last post by:
Hola!
I'm preparing my master thesis about a XML Merge Tool implementation and was
wondering if there is any open standard for XML diff regarding topics like:
- is a diff result computed on the ordered or unordered xml node tree of
the compared documents?
- what identifiers/criteria should be used by default to match elements of
the same type in different documents?
- should a diff tool consider move operations or only insert/delete
|
by: Steve Hershoff |
last post by:
Thanks to this newsgroup I've been pointed to Microsoft's XML Diff & Patch
utilities. I've been reading about how I can use the tools to generate a
diffgram between two XML documents, and how the XML Patch utility can (for
example) bring document A in line with document B. Very cool.
However, I was wondering if there's any way I can use the diffgram to
generate something else; a third type of document that highlights the
differences...
|
by: AirYT |
last post by:
Hello,
I'm looking for an implementation for diffing 2 (text) files and spitting
out the output using php only. i would like to extend this to use ftp to
diff two files on two ftp servers, or one local file & a remote ftp server.
Anyone have any ideas on source for this before i go ahead and build it? At
least the diff engine? a nice gui would be best, but not totally necessary.
TIA,
|
by: marktang |
last post by:
ONU (Optical Network Unit) is one of the key components for providing high-speed Internet services. Its primary function is to act as an endpoint device located at the user's premises. However, people are often confused as to whether an ONU can Work As a Router. In this blog post, we’ll explore What is ONU, What Is Router, ONU & Router’s main usage, and What is the difference between ONU and Router. Let’s take a closer look !
Part I. Meaning of...
|
by: jinu1996 |
last post by:
In today's digital age, having a compelling online presence is paramount for businesses aiming to thrive in a competitive landscape. At the heart of this digital strategy lies an intricately woven tapestry of website design and digital marketing. It's not merely about having a website; it's about crafting an immersive digital experience that captivates audiences and drives business growth.
The Art of Business Website Design
Your website is...
| | |
by: Hystou |
last post by:
Overview:
Windows 11 and 10 have less user interface control over operating system update behaviour than previous versions of Windows. In Windows 11 and 10, there is no way to turn off the Windows Update option using the Control Panel or Settings app; it automatically checks for updates and installs any it finds, whether you like it or not. For most users, this new feature is actually very convenient. If you want to control the update process,...
|
by: agi2029 |
last post by:
Let's talk about the concept of autonomous AI software engineers and no-code agents. These AIs are designed to manage the entire lifecycle of a software development project—planning, coding, testing, and deployment—without human intervention. Imagine an AI that can take a project description, break it down, write the code, debug it, and then launch it, all on its own....
Now, this would greatly impact the work of software developers. The idea...
|
by: isladogs |
last post by:
The next Access Europe User Group meeting will be on Wednesday 1 May 2024 starting at 18:00 UK time (6PM UTC+1) and finishing by 19:30 (7.30PM).
In this session, we are pleased to welcome a new presenter, Adolph Dupré who will be discussing some powerful techniques for using class modules.
He will explain when you may want to use classes instead of User Defined Types (UDT). For example, to manage the data in unbound forms.
Adolph will...
|
by: TSSRALBI |
last post by:
Hello
I'm a network technician in training and I need your help.
I am currently learning how to create and manage the different types of VPNs and I have a question about LAN-to-LAN VPNs.
The last exercise I practiced was to create a LAN-to-LAN VPN between two Pfsense firewalls, by using IPSEC protocols.
I succeeded, with both firewalls in the same network. But I'm wondering if it's possible to do the same thing, with 2 Pfsense firewalls...
|
by: adsilva |
last post by:
A Windows Forms form does not have the event Unload, like VB6. What one acts like?
|
by: 6302768590 |
last post by:
Hai team
i want code for transfer the data from one system to another through IP address by using C# our system has to for every 5mins then we have to update the data what the data is updated we have to send another system
| | |
by: muto222 |
last post by:
How can i add a mobile payment intergratation into php mysql website.
| |
