Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Fork of Unison File Synchronizer

branch: master

Make merge propagate props back to both replicas

This fixes an issue where the utime of the conflicting files is kept
at the original utime in each replica even though a successful merge
has occurred. Moreover, the archives are correctly updated to the utime
of the merged file (workingarch), which results in a spurious pending
props change on at least one of the replicas to restore the incorrect
utime (the archive has the correct utime, so the change in utime looks
like a legitimate update).

As a side effect, permissions are also propagated from whatever end up
being the working{1,2} files back to their respective replicas. This
is *not* what we want in general. To resolve this, copyBack should
define newprops as propsTo (as before), but update not only the length
(as before), but also the utime. Unfortunately, the Props and Fileinfo
interfaces don't allow this easily right now and I didn't want to make
major changes.
latest commit e763510165
ltoth authored
Octocat-spinner-32 lwt Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 system Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 ubase Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uimac Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uimacnew Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uimacnew09 Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 win32rc Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 .depend Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 BUGS.txt Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 CONTRIB Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 COPYING Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 INSTALL Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 INSTALL.gtk2 Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 INSTALL.win32 Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 INSTALL.win32-cygwin-gnuc Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 INSTALL.win32-msvc Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 Makefile Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 Makefile.OCaml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 NEWS Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 README Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 RECENTNEWS Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 ROADMAP.txt Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 TODO.txt Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 abort.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 abort.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 bytearray.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 bytearray.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 bytearray_stubs.c Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 case.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 case.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 checksum.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 checksum.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 clroot.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 clroot.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 common.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 common.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 copy.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 copy.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 external.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 external.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fileinfo.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fileinfo.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 files.ml Make merge propagate props back to both replicas February 09, 2011
Octocat-spinner-32 files.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fileutil.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fileutil.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fingerprint.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fingerprint.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fpcache.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fpcache.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fs.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fs.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fsmonitor.py Ignoring Unison temp files in update_changes February 04, 2011
Octocat-spinner-32 fspath.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 fspath.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 globals.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 globals.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 linkgtk.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 linkgtk2.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 linktext.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 lock.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 lock.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 main.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 mkProjectInfo.ml Make merge propagate props back to both replicas February 09, 2011
Octocat-spinner-32 name.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 name.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 os.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 os.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 osx.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 osx.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 osxsupport.c Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 path.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 path.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 pixmaps.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 pred.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 pred.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 props.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 props.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 pty.c Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 recon.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 recon.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 remote.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 remote.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 sortri.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 sortri.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 stasher.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 stasher.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 strings.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 strings.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 system.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 system.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 terminal.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 terminal.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 test.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 test.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 transfer.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 transfer.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 transport.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 transport.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 tree.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 tree.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 ui.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uicommon.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uicommon.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uigtk.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uigtk.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uigtk2.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uigtk2.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uimacbridge.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uimacbridgenew.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uitext.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uitext.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 unicode.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 unicode.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 unicode_tables.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 unison.hgr Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 update.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 update.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uutil.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 uutil.mli Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 winmain.c Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 xferhint.ml Initial commit to fork of unison's trunk November 09, 2010
Octocat-spinner-32 xferhint.mli Initial commit to fork of unison's trunk November 09, 2010
README
                        THE UNISON FILE SYNCHRONIZER

                 http://www.cis.upenn.edu/~bcpierce/unison

This directory is the source distribution for the unison file synchronizer.  

Installation instructions are in the file INSTALLATION section of the user manual.

License and copying information can be found in the file COPYING

Full documentation can be found on the Unison home page.

Contacts:
  - Bug reports should be sent to unison-help@cis.upenn.edu
  - General questions and discussion should be sent to 
      unison-users@groups.yahoo.com 
  - You can subscribe to this list using Yahoo's web interface
      http://groups.yahoo.com/group/unison-users

Credits:

OS X Unison Icon taken from Mac4Lin (LGPL)
     http://sourceforge.net/projects/mac4lin/
Some icons in the OSX GUI are directly taken from Matt Ball's developer icons 
     (Creative Commons Attribution 3.0)  
Others are based on Matt Ball's developer icons (Creative Commons Attribution 3.0)
     http://www.mattballdesign.com/blog/2009/11/23/developer-icons-are-back-online/
OSX GUI elements from BWToolkit (three-clause BSD license)
     http://www.brandonwalkin.com/bwtoolkit/
Something went wrong with that request. Please try again.