Interactive diff rsync
in [Debian]
|
Prev: dpkg -i libgssdp-1.0-dev_0.7.2-2_i386.deb error installing
Next: Tranfering iceweasel bookmark filest to new system (SOLVED)
From: Andre Majorel on 22 Jul 2010 12:10 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 advance. -- Andr� Majorel <http://www.teaser.fr/~amajorel/> The Debian project must be praised for their efforts in figthing spam by never exposing the email addresses of their users. -- To UNSUBSCRIBE, email to debian-user-REQUEST(a)lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmaster(a)lists.debian.org Archive: http://lists.debian.org/20100722160334.GB6008(a)aym.net2.nerim.net
From: Karl E. Jorgensen on 22 Jul 2010 13:00 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 -- To UNSUBSCRIBE, email to debian-user-REQUEST(a)lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmaster(a)lists.debian.org Archive: http://lists.debian.org/20100722164245.GW10801(a)fizzback.net
From: Anand Sivaram on 22 Jul 2010 13:10 On Thu, Jul 22, 2010 at 21:33, Andre Majorel <aym-naibed(a)teaser.fr> 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. > > Thanks in advance. > > -- > André Majorel <http://www.teaser.fr/~amajorel/<http://www.teaser.fr/%7Eamajorel/> > > > The Debian project must be praised for their efforts in figthing > spam by never exposing the email addresses of their users. > > > -- > To UNSUBSCRIBE, email to debian-user-REQUEST(a)lists.debian.org > with a subject of "unsubscribe". Trouble? Contact > listmaster(a)lists.debian.org > Archive: http://lists.debian.org/20100722160334.GB6008(a)aym.net2.nerim.net > > >From your requirement, the best option may be to use a distributed version control system like git. It could do all of these through a terminal.
From: Erwan David on 22 Jul 2010 13:20 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 through an SSH tunnel, like rsync. > > Thanks in advance. Isn't it what mergemaster does on FreeBSD ? -- Erwan -- To UNSUBSCRIBE, email to debian-user-REQUEST(a)lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmaster(a)lists.debian.org Archive: http://lists.debian.org/20100722171658.GB2156(a)rail.eu.org
From: =?utf-8?Q?Fran=C3=A7ois?= TOURDE on 22 Jul 2010 14:20
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 > the source tree through an SSH tunnel, like rsync. Try emacs with <M-x>ediff-directories, maybe with tramp package, and use the syntax "/hostname:/some/path/to/tree/". It's a must for this kind of usage. -- To UNSUBSCRIBE, email to debian-user-REQUEST(a)lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmaster(a)lists.debian.org Archive: http://lists.debian.org/87k4ono02n.fsf(a)fermat.tourde.home |