I have: I keep my music collection in 3 places (2 different PCs and the empeg). When I move folders or rename files, using rsync means that I always end up with both copies reappearing on both ends. I can't use a single-master model, 'cos I rip CDs at both computers.

I use a program called unison for this kind of stuff on my unix boxen. Uses a rsync like algo (compares blocks of files using checksums and only transfers changed blocks) but does bi-directional syncs. Very cool. Homepage is http://www.cis.upenn.edu/~bcpierce/unison

-Mike