Merge tools

[Lester Caine]

Snidely wrote:
>
>
> On Nov 23, 5:12 pm, Scott Palmer<swpal... at gmail.com>  wrote:
>
>> I also have heard good things about BeyondCompare ($50 USD for a single
>> license)http://www.scootersoftware.com/index.php
>
> I'm a real happy BC user, though I don't do 3-way merges with it yet
> (requires the pro features enabled).  The downside from Erik's point
> of view is that they don't have a real OS X version as the Delphi RT
> hasn't gotten there yet.
>
> I use BC to do backups and synchs of working directories as well as
> for comparing source files.  It also compares the textual content of
> pdfs, the text/csv of MSO and OO files, and has syntax support
> (including XML).  Oh, and they've recently added Windows Registry
> support.
>
> Their web site has some videos showing use of the merge features.

I would add to that ... I've been using BC for many years even before the linux 
version came out ... and it has always provided all of the merge facilities that 
I have needed. It is a good example of why the complaint about merge problems 
with CVS is a problem ... BC has solved that problem for years.

It also integrates into Eclipse nicely and is one of the very few packages I 
actually pay money for. All that is needed is a fully functional hg plugin for 
Eclipse with a fupply completed subrepo capability to replace the seamless 
integration of both SVN or VS in Eclipse ...

-- 
Lester Caine - G8HFL
-----------------------------
Contact - http://lsces.co.uk/wiki/?page=contact
L.S.Caine Electronic Services - http://lsces.co.uk
EnquirySolve - http://enquirysolve.com/
Model Engineers Digital Workshop - http://medw.co.uk//
Firebird - http://www.firebirdsql.org/index.php