Author: ericwa
Date: Thu Jan 16 23:53:58 2014
New Revision: 10082
URL: http://svn.gna.org/viewcvs/etoile?rev=10082&view=rev
Log:
Fix two bugs in COSynchronizer. First, it was using a poor choice of common
ancestor when rebasing commits (added a comment explaining the new choice,
_lastRevisionUUIDInTransitToServer). Second, the selection of commits to merge
in order to generate the rebased revisions was wrong, and led to changes being
added more than once
Modified:
trunk/Etoile/Frameworks/CoreObject/Synchronization/COSynchronizerClient.m
trunk/Etoile/Frameworks/CoreObject/Synchronization/COSynchronizerServer.m
trunk/Etoile/Frameworks/CoreObject/Synchronization/COSynchronizerUtils.h
trunk/Etoile/Frameworks/CoreObject/Synchronization/COSynchronizerUtils.m
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizer.m
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
