SuccessChanges

Summary

  1. Implemented merging CryptoRepoFiles collided on the server.
  2. Fixed one test leaking RepoToRepoSyncCoordinator into following test.
Revision 406 by Marco Nguitragool-Schulze:
Implemented merging CryptoRepoFiles collided on the server.
The file was added/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptoRepoFileMerger.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/AssignCryptoRepoFileRepoFileListener.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFile.java
The file was modified/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionRepoToRepoSyncIT.java
Revision 405 by Marco Nguitragool-Schulze:
Fixed one test leaking RepoToRepoSyncCoordinator into following test.
The file was modified/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionRepoToRepoSyncIT.java