Changes

Jump to navigation Jump to search
1,016 bytes added ,  11:09, 24 September 2012
updated for dealing with .DS_Store files and resolving conflicts by hand
Line 2: Line 2:     
Unison [http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html Manual].
 
Unison [http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html Manual].
 +
 +
Unison [https://alliance.seas.upenn.edu/~bcpierce/wiki/index.php?n=Main.UnisonFAQOSSpecific#osx Mac OS X FAQs].
    
==Set Up==
 
==Set Up==
Line 57: Line 59:  
  -times
 
  -times
 
synchronize the modification times?
 
synchronize the modification times?
 +
-ignore 'Name .DS_Store"
 +
Unison will ignore all files with the name .DS_Store (On Mac OS X,  .DS_Store files encode only trivial appearance stuff like icon position, but .DS_Store files are changed everytime a folder is opened so frequently generate irrelevant conflicts.)
    
==AppleScript==
 
==AppleScript==
Line 62: Line 66:  
To avoid opening the terminal window, create the following AppleScript and save as an application.
 
To avoid opening the terminal window, create the following AppleScript and save as an application.
   −
  do shell script "unison /User/houpt/uniDisk ssh://houptlab.org/uniDisk -ui text -batch -times"
+
  do shell script "unison /User/houpt/uniDisk ssh://houptlab.org/uniDisk -ui text -batch -times -ignore 'Name .DS_Store' "
 +
 
 +
Results of the synch will be silent, but will be stored in the "unison.log" file. If there are conflicts to be resolved, then the applescript will post a dialog window.
 +
 
 +
==Conflicts==
 +
 
 +
Conflicts arise when the server and the local directory have conflicting dates (i.e. the versions on office computer and laptop were independently edited, so are now out of sync.)  If there are conflicts to be resolved, then the applescript will post a dialog window.
 +
 
 +
unison /User/houpt/uniDisk ssh://houptlab.org/uniDisk -ui text -times -ignore 'Name .DS_Store'
   −
Results of the synch will be silent, but will be stored in the "unison.log" file.
+
For each conflict, < moves from server to local, > moves from local to server, / skips the file, f means follow Unison recommendation.

Navigation menu