Christian Kamm
5d777604f4
Tests: Add db checks to rename/move tests
...
For moves it's relevant that the old db entry is removed and the new one
is created at the right location.
2019-02-11 13:35:14 +01:00
Olivier Goffart
dfdcd3ff54
Move: Fix move detection in directory move on the other side
2019-01-22 08:14:12 +01:00
Olivier Goffart
8407f8b9e6
Move: add comments and tests
2019-01-22 08:14:12 +01:00
Olivier Goffart
303922b80f
Move: add more test and fix move within moves
2019-01-22 08:14:12 +01:00
Olivier Goffart
a4990c0a85
Rename: fix renamed folder moved into renamed folder issue
...
Issue #6694
2019-01-22 08:14:12 +01:00
Olivier Goffart
597c28f316
Merge remote-tracking branch 'master' into new_discovery_algo
2018-08-21 11:22:38 +02:00
Olivier Goffart
4a3fce531c
SyncEngine: Fix renames making hierarchy inversion
...
Issue #6694
2018-08-16 10:38:18 +02:00
Olivier Goffart
09deeaf8a8
Merge remote-tracking branch 'owncloud/master' into new_discovery_algo
...
Conflicts:
src/csync/csync_reconcile.cpp
src/csync/csync_update.cpp
2018-07-25 14:06:14 +02:00
Olivier Goffart
384afe195e
New discovery algoritmh: more on Renames
2018-07-13 17:47:37 +02:00
Olivier Goffart
90ec9a9735
Reconcile: When detecting a local move, keep the local mtime
...
https://github.com/owncloud/client/issues/6629#issuecomment-402450691
2018-07-05 16:31:16 +02:00
Christian Kamm
afec3ccf6e
Conflicts: Change tags to be more user friendly #6365
...
From "_conflict-user-yyyymmdd-hhmmss"
to " (conflicted copy user yyyy-mm-dd hhmmss)"
2018-04-03 14:03:03 +02:00
Olivier Goffart
4369853ddb
TestSystem: Add QIODevice in the serverOverride function, and add a DelayedReply
...
Preparing to add test that needs the QIODevice.
Also make the DelayedReply so we can generalize the existing delay on FakeChunkMoveReply
to any reply.
2017-12-14 11:56:12 +01: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
