Re: Interactive diff rsync

2010-07-23 Thread Tzafrir Cohen
On Fri, Jul 23, 2010 at 07:56:02AM +0530, Anand Sivaram wrote: > Another option is to mount the ssh remote using sshfs and use any standard > gui based diff/merge tools like meld, kdiff3 etc. This means that you have to get both over the wire merely in order to see the difference. This doesn't sc

Re: Interactive diff rsync

2010-07-22 Thread Anand Sivaram
On Thu, Jul 22, 2010 at 23:44, François TOURDE wrote: > Le 14812ième jour après Epoch, > Andre Majorel écrivait: > > > 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 ? > > >

Re: Interactive diff rsync

2010-07-22 Thread François TOURDE
Le 14812ième jour après Epoch, Andre Majorel écrivait: > 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 > t

Re: Interactive diff rsync

2010-07-22 Thread Erwan David
Le Thu 22/07/2010, Andre Majorel disait > 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

Re: Interactive diff rsync

2010-07-22 Thread Anand Sivaram
On Thu, Jul 22, 2010 at 21:33, 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

Re: Interactive diff rsync

2010-07-22 Thread Karl E. Jorgensen
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 ac

Interactive diff rsync

2010-07-22 Thread Andre Majorel
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. Thanks in advanc