Re: Interactive diff rsync

["Karl E. Jorgensen" <kjorgensen@fizzback.com>]

On Thu, Jul 22, 2010 at 06:03:34PM +0200, Andre Majorel wrote:
> Anyone knows of some software that will compare two trees and, for
> each file that differs, show you a diff and ask whether you want
> to update the destination file ?
> 
> It must run in a terminal (no GUI) and it must be able to access
> the source tree through an SSH tunnel, like rsync.

I think that unison should fit the bill (it will do two-way synchronisation).
And I *think* you can get it to show the diff too..

-- 
Karl E. Jorgensen
IT Operations Manager