3 Commits

Author	SHA1	Message	Date
Olivier Goffart	2e10cec2cb	Reconcile: When detecting a local move, keep the local mtime ... https://github.com/owncloud/client/issues/6629#issuecomment-402450691 (cherry picked from commit 90ec9a9735)	2018-07-05 17:32:11 +02:00
Christian Kamm	ceac18c554	Reconcile: Rename maps are consistent with update phase #6212 ... For duplicate file ids the update phase and reconcile phase determined the rename mappings independently. If they disagreed (due to different order of processing), complicated misbehavior would result. This patch fixes it by letting reconcile try to use the mapping that the update phase has computed first.	2017-12-06 16:42:11 +01:00
Christian Kamm	9c7ee6ef85	Reconcile: Rename handling fixes: duplicate file ids ... When users share the same tree several times (say A/ and A/B/ are both shared) the remote tree can have several entries that have the same file id. This needs to be respected in rename detection. Also adds several tests and fixes for issues noticed during testing. See #6096	2017-10-24 10:54:23 +02:00