Re: [MiNT] QED

[p.slegg@scubadivers.co.uk]

>---- Original Message ----
>From: Eero Tamminen <oak@helsinkinet.fi>
>To: mint@lists.fishpool.fi, "Peter Slegg" <p.slegg@scubadivers.co.uk>
>Sent: Fri, Jan 8, 2010, 11:45 AM
>Subject: Re: [MiNT] QED
>
>Hi,
>
>On Thursday 07 January 2010, Peter Slegg wrote:
>> > > CVS
>> > > * can compare local code with CVS rep
>> > > * can merge bits of code from CVS into local version
>
>Something similar to Meld:
>	http://meld.sourceforge.net/
>
>Or kdiff3:
>	http://kdiff3.sourceforge.net/
>?
>
>Or MediaWiki:
>http://en.wikipedia.org/w/index.php?title=MiNT&diff=288865417&oldid=279511593
>;-)
>
>> > > * easy to CVS update/commit/checkout/rollback
>
>
>	- Eero

http://meld.sourceforge.net/meld_file1.png

Like this.

With IDEA it is very easy. When editing a module just a right click
menu allows you to compare the local copy with the cvs HEAD or
any version.

Up pops another window like the one above showing the differences.
It uses a system like the arrows in Meld between the columns to
let the user push changes across into the local copy.

The same sort of thing happens when doing an update of the local copy
and there is a clash requiring a merge.

Peter