28

I'm copying lots of files that have changed from one server to another using rsync. I know I can use the -n option to do a dry run, so I can see what files have been changed. However is it possible to get rsync to print a diff of the file contents that's changed? I'd like to see what's happening before doing a copy? Something I can save to a file and the apply with diff(1) later?

Amandasaurus
  • 33,461

8 Answers8

11

There might be a better way, but this might work, albeit not that efficiently:

 rsync -irn / dest:/ | grep -oP '^\S+\s+\K.+' > ~/file_list

Review that list, then:

while read -r file; do
    file_quoted=\'${file//\'/\'\\\'\'}\'
    diff "$file" <(ssh dest "cat $file_quoted")
done < ~/file_list

Another Option:
You might also consider mounting the file system with something like sshfs/fuse, and then just using diff.

Walf
  • 501
Kyle Brandt
  • 85,693
7

For create patch:

rsync -arv --only-write-batch=patch new/ old/

For apply it:

rsync -arv --read-batch=patch dir/

or use auto-generated script:

./patch.sh

Sources:

Hongda Zhang
  • 3
FarK
  • 177
2

rsync can't do this natively, but if there's a possibility of using unison you can produce diff style format from that.

Philip Reynolds
  • 10,037
1

There's a way to do this by utilising the --compare-dest=DIR option of rsync. It can do a sparse sync (transfer only the changed files) into a temporary directory, which you can diff against on the remote. This safely leaves the real destination files untouched.

Example:

rsync --recursive --checksum --compare-dest=../dest-actual/ /path/to/source/ remote-server:/path/to/dest-for-diffing/
ssh remote-server
cd /path/to/
diff --recursive --unified=4 dest-actual/ dest-for-diffing/ > ~/changes.patch
vim ~/changes.patch

You can pipe the diff through grep -vE '^Only in ' to skip the noise from unchanged files. Note that this, like other solutions here, does not deal with files that have been deleted from the local but still exist on the remote.

Walf
  • 501
1

To expand on Kyle's answer, this automates the process. Note that it is totally untested, probably pretty fragile, and may delete your computer and kill your dog.

#!/bin/bash

REMOTE=${1?Missing Remote Path}
LOCAL=${2?Missing Local Path}

# Trim trailing slash since we'll be adding it as a separator later
REMOTE=${REMOTE%/}
LOCAL=${LOCAL%/}

#Break it down
RHOST=${REMOTE%:*}
RPATH=${REMOTE#*:}

while read FILE; do
    diff -u ${LOCAL}/${FILE} <(ssh $RHOST "cat ${RPATH}/${FILE}")
done < <(rsync -vrn $REMOTE/ $LOCAL/ | sed '1d;/^$/q')
tylerl
  • 15,245
1

It's not possible natively because rsync only cares about binary differences between files.

You might be able to script it, using rsync's output. But it would be hackish.

I do believe it's natively possible with Unison though.

Walf
  • 501
Dan Carley
  • 26,127
1

Why not just use something like diff (for text files) or xdelta (for binary files) to generate the diffs? Why do you need to specifically get something out of rsync?

womble
  • 98,245
0

The rsync algorithm works by comparing binary chunks of the file. Such binary diff is not meant to be printable. There is a command called rdiff that uses the rsync algorithm to generate a binary diff, but I don't think it'd be useful for what you describe, it is commonly used to implement incremental backups.

sagi
  • 717