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
..
benchmarks	benchlargesync: Do several syncs	2017-09-25 12:49:55 +02:00
csync	Excludes: Fix bug with escapes in the regex, add tests	2017-10-05 10:40:53 +02:00
manual/favlink	License: Adjust license of GPLv2 source files to GPLv2+	2016-10-25 11:06:54 +02:00
mockserver	Use QDateTime::currentDateTimeUtc instead of the non utc version	2017-09-26 16:14:17 +02:00
scripts	t9.pl: Make more reliable	2017-10-05 14:13:10 +02:00
CMakeLists.txt	Reconcile: Rename handling fixes: duplicate file ids	2017-10-24 10:54:23 +02:00
owncloud_add_test.cmake	Move csync to src/csync	2017-08-22 11:18:22 +02:00
stub.cpp	test/stub: add some call required by the next patches	2017-09-21 14:05:39 +02:00
syncenginetestutils.h	test/syncenginetestutils.h: Don't use toTimeZone only to get the UTC	2017-12-01 13:18:09 +01:00
test_journal.db	test_journal.db: Add checksumtype table	2017-06-22 15:11:49 +02:00
testallfilesdeleted.cpp	SyncEngine: _hasNoneFiles should be set when there are INSTRUCTION_UPDATE_METADATA	2017-09-28 11:15:36 +02:00
testchecksumvalidator.cpp	Move SyncJournalDB to src/common	2017-09-18 14:00:52 +02:00
testchunkingng.cpp	TestChunkingNG: Test that resuming does not send past data.	2017-11-21 11:19:14 +01:00
testconcaturl.cpp	Move concatUrl and settingsWithGroup to Utility	2016-10-25 12:05:28 +02:00
testexcludedfiles.cpp	Move csync to src/csync	2017-08-22 11:18:22 +02:00
testfilesystem.cpp	Move Utility to a new common static library	2017-09-05 17:25:19 +02:00
testfolder.cpp	Move Utility to a new common static library	2017-09-05 17:25:19 +02:00
testfolderman.cpp	remove qt4 code	2017-09-15 07:11:05 +02:00
testfolderwatcher.cpp	Move Utility to a new common static library	2017-09-05 17:25:19 +02:00
testinotifywatcher.cpp	Move Utility to a new common static library	2017-09-05 17:25:19 +02:00
testnetrcparser.cpp	For tests we do not need a xserver running.	2016-05-12 11:34:21 +02:00
testoauth.cpp	Test OAuth2	2017-09-28 18:38:33 +02:00
testowncloudpropagator.cpp	For tests we do not need a xserver running.	2016-05-12 11:34:21 +02:00
testownsql.cpp	Move SyncJournalDB to src/common	2017-09-18 14:00:52 +02:00
testplan.txt	Minor typos in client test section	2015-09-10 18:11:44 +05:45
testsyncengine.cpp	Checksum: Ignore unkown OC-Checksum header when downloading...	2017-11-20 10:51:15 +01:00
testsyncfileitem.cpp	For tests we do not need a xserver running.	2016-05-12 11:34:21 +02:00
testsyncfilestatustracker.cpp	SyncFileStatusTracker: Detect changed in the shared flag	2017-10-24 15:50:14 +02:00
testsyncjournaldb.cpp	Use SyncJournalDb in csync	2017-09-26 11:03:23 +02:00
testsyncmove.cpp	Reconcile: Rename maps are consistent with update phase #6212	2017-12-06 16:42:11 +01:00
testupdater.cpp	For tests we do not need a xserver running.	2016-05-12 11:34:21 +02:00
testuploadreset.cpp	Use SyncJournalDb in csync	2017-09-26 11:03:23 +02:00
testutility.cpp	remove qt4 code	2017-09-15 07:11:05 +02:00
testxmlparse.cpp	remove qt4 code	2017-09-15 07:11:05 +02:00