On 2 May 2009, at 22:33, Simon wrote:
> ...
>   I've been using unison to synchronise and backup my computers.   
> unison is based on rsync IIRC but with the difference that it  
> 'remembers' the state of the folder that was synchronised.  This  
> way, if I delete a file on A, when sync'ing it will be deleted on  
> B.  While rsync would leave the file on B...
>
>   I see rsync as a very good 'cp' program, but I need something that  
> can deal with conflicts (file changed on both hosts/directories) and  
> can propagate changes like deletes properly.  ...


http://www.linuxjournal.com/article/5976
http://kitenet.net/~joey/svnhome/

http://www.google.com/search?q=homedir+version+control

Stroller.