Difference between revisions of "Diff And Patch"

From Valve Developer Community
Jump to: navigation, search
(Diff Tools)
m (oops)
Line 21: Line 21:
 
*  Meld is a visual diff and merge tool. It integrates especially well with CVS. The diff viewer lets you edit files in place (diffs update dynamically), and a middle column shows detailed changes and allows merges. Gnome app.
 
*  Meld is a visual diff and merge tool. It integrates especially well with CVS. The diff viewer lets you edit files in place (diffs update dynamically), and a middle column shows detailed changes and allows merges. Gnome app.
  
* [http://meld.sourceforge.net/]
+
* [http://meld.sourceforge.net/ Meld]
  
  

Revision as of 12:00, 31 July 2005

Diff Tools

Diff tools can be extremely useful when working on large projects, especially when sharing code between several programmers without the aid of a revision control system such as CVS or Perforce. These tools make it possible to track changes betwen two different versions of a mod, and are even capable of seamlessly merging two different mods.

Yet another use is to examine changes on the SDK tree after a update, in addition to reading the changelog.

AlienBrain
  • A groupware framework for game developing, includes a good diff tool.
  • AlienBrain
Beyond Compare
Cygwin
  • A POSIX layer for Windows which includes many popular GNU tools such as GCC (GNU Compiler Collection), GNU Patch, etc.
  • Cygwin
Meld
  • Meld is a visual diff and merge tool. It integrates especially well with CVS. The diff viewer lets you edit files in place (diffs update dynamically), and a middle column shows detailed changes and allows merges. Gnome app.


Winmerge
  • A Windows tool for examining differences between two set of files.
  • Winmerge

You can read more about how diff software works here: