Klaas Freitag
0764ef1620
For directories, do not consider the size as its invalid on remote.
2013-05-22 16:10:43 +02:00
Olivier Goffart
3c87cd71d7
Merge branch 'rename_folders' into dav
...
Conflicts:
modules/csync_owncloud.c
src/csync.c
src/csync.h
src/csync_propagate.c
src/csync_propagate.h
src/csync_statedb.c
src/csync_statedb.h
src/csync_util.c
src/std/c_path.h
2013-05-07 15:24:12 +02:00
Olivier Goffart
b1ac67ce8b
Always consider that the conflict should happen on the locale
...
Don't take in account which file is newer, the conflict file will always
be on the locale side.
This patch also consider that INSTRUCTION_NEW and INSTRUCTION_EVAL means
the same.
2013-05-07 10:48:44 +02:00
Klaas Freitag
374d9b0a8c
Merge from feature branch csync_commit.
2013-04-22 15:39:43 +02:00
Klaas Freitag
90c4f52b34
Handle IGNORE status correctly.
2013-04-09 11:12:17 +02:00
Klaas Freitag
3d4b426137
Removed some useless logging.
2013-02-19 09:40:14 +01:00
Olivier Goffart
2615205adc
Fix renaming folder when a file was modified by another client
2013-02-06 18:40:03 +01:00
Olivier Goffart
fe756799d2
Make it work when renaming a directory and a subdirectory at the same
...
time
2013-02-06 18:40:02 +01:00
Olivier Goffart
0c874f0c3c
fix some issues while moving. Now it works in simple cases
2013-02-06 18:40:02 +01:00
Olivier Goffart
d88c58deae
WIP: rename folders
2013-02-06 18:40:02 +01:00
Olivier Goffart
3b4b500d4f
leak fix
2013-01-10 11:32:42 +01:00
Olivier Goffart
10965eaa98
Fix renaming if the other file already exist on the server.
...
In that case, we have a conflict. Handle it the same ways as for new
files.
2012-12-12 14:20:48 +01:00
Klaas Freitag
7bce6696d4
Discover DST time error and correct.
2012-11-20 17:33:25 +01:00
Klaas Freitag
eb640aae00
Fix parsing of GMT times and handle time difference more tolerant.
2012-11-08 14:52:14 +01:00
Olivier Goffart
be13ef120d
Fix another crash if the md5 are not computed
2012-11-07 16:50:20 +01:00
Klaas Freitag
abb3829197
Use win32 function GetFileTime to fix DTS problems on windows.
2012-10-31 20:56:24 +01:00
Klaas Freitag
2bb52ef6f9
Merge branch 'master' into dav - get cmocka tests and database move.
...
Conflicts:
CMakeLists.txt
cmake/Modules/FindCMocka.cmake
src/csync.c
src/csync_exclude.c
src/csync_reconcile.c
src/csync_statedb.c
src/csync_update.c
src/csync_util.c
src/vio/csync_vio.c
tests/CMakeLists.txt
tests/csync_tests/check_csync_exclude.c
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_update.c
tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Benjamin Legrand
cb8a501241
Fix a typeo and rename REPLCIA to REPLICA.
...
BUG #8
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-10-19 15:59:51 +02:00
Klaas Freitag
aad8e5320a
Some more memory cleanups after valgrinding.
2012-10-18 13:26:44 +02:00
Klaas Freitag
d8967a2bd1
try to propagate EVAL status up by detecting changes in underlying
...
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
2012-08-23 17:41:53 +03:00
Klaas Freitag
2a40106e70
Fixed merge conflict.
2012-08-23 17:33:41 +03:00
Klaas Freitag
3ae996c688
Fixed rename support for Win32. Need to use unit64 instead of ino_t.
2012-08-03 18:48:44 +03:00
Klaas Freitag
253605758e
Use remote rename if local rename is detected.
2012-08-02 16:58:54 +03:00
Andreas Schneider
f0cf678c0e
Fix config checks.
2012-03-02 17:04:02 +01:00
Andreas Schneider
6dca82a4a1
reconcile: Fix return value.
2012-02-04 12:26:27 +01:00
Christian Jann
ffd7d5b247
better idea to align the INSTRUCTIONs printf(%-20s,...)
2011-04-12 19:42:08 +02:00
Christian Jann
9c40ecafc4
csync.reconciler: show the correct type: "file" or "dir"
2011-04-12 17:59:25 +02:00
Christian Jann
a8071bfd14
csync.propagator/csync.reconciler first print instruction type,
...
than print the path and align everything correctly (easier to read)
2011-04-12 17:06:18 +02:00
Christian Jann
f65612ff2e
hide instruction NONE messages when log level is set to debug,
...
only show these messages on log level trace
2011-04-12 13:20:50 +02:00
Christian Jann
d842119065
improved logging
2011-04-06 17:07:20 +02:00
Christian Jann
e4d8e793f6
added new conflict resolution to libcsync
...
- use the latest version of the two files under its original filename
in both destinations (same as currently implemented)
- additionally, create a copy of the older file under a different name
using the same file extension with appended marker (e.g. "conflict")
and timestamp in both destinations
(e.g. textfile.odt -> textfile_conflict-20100222-105000.odt)
- At the Moment 'textfile_conflict-20100222-105000.odt' is only created
on the side where the conflict has occurred and gets synced to the other side
on the second sync.
2011-04-06 16:57:24 +02:00
Andreas Schneider
62b33fbf2d
Fix textwidth.
2009-05-25 11:59:30 +02:00
Andreas Schneider
fdea54edc5
Fix the vim modlines.
2009-05-13 10:12:07 +02:00
Andreas Schneider
cd2ab8353d
Add some documentation for the merge algorithm.
2008-09-03 09:49:12 +02:00
Andreas Schneider
076c7fb819
More code cleanup for PPC.
2008-06-27 18:01:19 +02:00
Andreas Schneider
e2b049c935
Static functions should all start with an underscore.
...
For better readablity...
2008-06-02 15:11:45 +02:00
Andreas Schneider
08e6be673b
Fixed bug where we remove file which is newer on other replica.
2008-05-15 20:15:17 +02:00
Andreas Schneider
6c177c6cff
Fix modtime comparsion should check for smaller modtime.
2008-05-15 20:04:12 +02:00
Andreas Schneider
cf545797a3
Get a more equalent debug output or trace.
2008-05-15 20:00:01 +02:00
Andreas Schneider
1dcb48ad8f
Don't sync equal files.
2008-05-15 19:20:01 +02:00
Andreas Schneider
4489fbfa2b
Implement the reconciler.
2008-05-15 13:50:34 +02:00
