[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] Unified Diff viewer

From: Matthew S. Moore <mmoore_at_asf.alaska.edu>
Date: 2005-02-25 04:49:08 CET

Amir Kolsky wrote:
> If I want to see the differences between two directories, my only
> recourse is to use unified diff. This however is not useful if you want
> to see all the files that were changed.
>
> Is there any program that splits the unified diff into two panels each
> showing files from a single directory, aligned. So the differences as
> well as the changed files will be obovious?
>
> Amir Kolsky
> XP& Software
>

I recommend using KDiff3 at http://kdiff3.sourceforge.net/

  KDiff3 is a program that

     * compares or merges two or three text input files or directories,
     * shows the differences line by line and character by character (!)

This works great with TSVN!

Select TortoiseSVN->Settings
Select Diff/Merge tab
Diff Program (External): Path_To_KDiff3\kdiff3.exe %base %mine
Merge Program (External): Path_To_KDiff3\kdiff3.exe %base %theirs \
   %mine -o %merged

Matthew

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Matthew S Moore                          Alaska Satellite Facility
Configuration Manager                    Geophysical Institute
& Development Engineer                   University of Alaska Fairbanks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Feb 25 04:50:10 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.