rsync - Sep 2004 - Rsync diff mode (again)?

Hi,

I would like to diff two files using rsync.

Here is a little background,

I use a little pair of scripts to keep sync-ed at work and home. Sometimes
I forget which copy is up to date, and rsync says that both should be
updated...

./put_to_beta.sh -n
building file list ...
233 files to consider
...
Analysis/TP_FP/cd_hit_fp_tn.sql
...

./get_to_genus.sh -n
receiving file list ...
228 files to consider
...
Analysis/TP_FP/cd_hit_fp_tn.sql
...


I would like to do something like...

rsync --diff Analysis/TP_FP/cd_hit_fp_tn.sql me@beta:/Dest/Dir

so I could quickly decide to put or get this file (or do a merge). 

I have been using cvs, but it is a hassle to set up and maintain
(especially when I shift directories around all the time in a hap-hazard
way, and I mix raw data files and small sripts etc., etc.).

Basically I would like to use rsync for this because of its convenience,
and the diff problem seems to fit the way rsync works (although I am
totaly ignorant of the details).

Those people who offer the suggestion of 'use a wrapper script' in
response to similar feature requests, can you please give an example?

I am sorry if this question has already been answered, but doing the
following...

http://www.google.com/search?q=site%3Ahttp%3A%2F%2Flists.samba.org+rsync+diff

Turns up around 1600 hits.


Thanks very much for any information you can give,
All the best,
Dan.

On Tue, Sep 14, 2004 at 07:42:46PM +0100, Dan Bolser
wrote:
> I would like to diff two files using rsync.
Try using "unison".  It uses the rsync protocol to transfer its files,
has the ability to show you the diffs for two files that differ, and
lets you choose which direction to transfer the file (or to skip it).

..wayne..

One thing I liked about rsync was that I could use it right away with only
the rsync --help option.

I will try to get unison going, or get going with unison. I wonder why I
hate learning new things these days.

Cheers,
Dan.

On Thu, 16 Sep 2004, Wayne Davison wrote:
>On Tue, Sep 14, 2004 at 07:42:46PM +0100, Dan Bolser wrote:
>> I would like to diff two files using rsync.
>
>Try using "unison".  It uses the rsync protocol to transfer its
files,
>has the ability to show you the diffs for two files that differ, and
>lets you choose which direction to transfer the file (or to skip it).
>
>..wayne..
>