Andreas Schneider
6dca82a4a1
reconcile: Fix return value.
2012-02-04 12:26:27 +01:00
Andreas Schneider
4e5b29257e
include: Fix packed attribute for file structure.
2012-02-04 12:23:54 +01:00
Andreas Schneider
1c52b90fa4
Pack the csync_file_stat structure.
2012-02-04 12:15:48 +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
deb620b5be
align everything correctly (easier to read)
...
prefix "CSYNC_": no extra information -> removed
we could even remove "INSTRUCTION_" or change it to "INST_"
2011-04-12 17:09:39 +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
aad3e146fc
set instruction after conflict backup for the statedb merger to NONE
2011-04-12 10:09:41 +02:00
Christian Jann
92dc16a59e
Increase version numbers.
2011-04-06 17:08:52 +02:00
Christian Jann
9864baa0c8
fixed small error:
...
csync/first/a~
was renamed to:
csync/first/~a_conflict-20110326-190457~
but it should be:
csync/first/a_conflict-20110326-190457~
2011-04-06 17:08:01 +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
Christian Jann
09980fcf5a
fix hundreds of these warnings:
...
csync.c:272:75: warning: ISO C99 requires rest arguments to be used
2011-04-06 16:56:05 +02:00
Andreas Schneider
3a9bfdb489
Increase version numbers.
2010-02-15 11:56:35 +01:00
Andreas Schneider
6c2c86aa50
Fixed build warning.
2009-09-12 12:27:03 +02:00
Andreas Schneider
16c76166bd
Improve detection of system libraries.
2009-09-01 12:25:10 +02:00
Andreas Schneider
312c40d16f
Improve c_list_find functions.
2009-06-05 11:22:06 +02:00
Andreas Schneider
f98265b30e
Some code cleanups.
2009-06-05 10:51:22 +02:00
Andreas Schneider
460aa67dca
Document the propagation functions.
2009-05-25 12:58:34 +02:00
Andreas Schneider
778640f1e1
Fix the documentation of the reconciliation.
2009-05-25 12:58:00 +02:00
Andreas Schneider
62b33fbf2d
Fix textwidth.
2009-05-25 11:59:30 +02:00
Andreas Schneider
7c88ed8454
Document Reconcilation.
2009-05-25 11:58:51 +02:00
Andreas Schneider
022731b241
Add a group for update detection functions.
2009-05-25 11:58:31 +02:00
Andreas Schneider
7ab802a3b2
Document update detection functions.
2009-05-25 11:42:46 +02:00
Andreas Schneider
3c05e000f8
Reformat some code in update detection functions.
2009-05-25 11:33:18 +02:00
Andreas Schneider
f57576f08a
Cleanup c_list_insert_sorted().
2009-05-23 11:57:15 +02:00
Andreas Schneider
5dda8fdfa5
Some code reformating.
2009-05-22 20:23:54 +02:00
Andreas Schneider
1d7ce7d5fe
Improve the documentation of csync_excluded().
2009-05-22 20:21:20 +02:00
Andreas Schneider
dd3c9cd99e
Document csync_config_load().
2009-05-22 20:19:06 +02:00
Andreas Schneider
6e893ab31c
Document the return value of c_list_remove().
2009-05-21 11:53:07 +02:00
Andreas Schneider
f79b291646
Add a c_rmdirs() function.
2009-05-14 17:22:42 +02:00
Andreas Schneider
fdea54edc5
Fix the vim modlines.
2009-05-13 10:12:07 +02:00
Andreas Schneider
df5a8d6662
Add a macro to get the size of an array.
2009-05-06 19:35:21 +02:00
Andreas Schneider
73548e8a16
Merge branch 'master' of git://git.csync.org/projects/csync/csync
2009-04-29 10:08:34 +02:00
Andreas Schneider
e7a495dc50
Fix a segfault in c_uppercase and c_lowercase.
2009-04-29 09:55:32 +02:00
Andreas Schneider
9de1f977b5
Cleanup some code of the doubly-linked list.
2009-04-25 10:57:46 +02:00
Andreas Schneider
867a8cb246
Reformat some code.
2009-04-22 13:41:46 +02:00
Andreas Schneider
e7a09af755
Add a function to uppercase and to lowercase a string.
2009-04-21 09:05:40 +02:00
Andreas Schneider
7d0393338c
Fix possible precedence problems.
2009-03-27 00:00:49 +01:00
Andreas Schneider
5d84518f00
Fix comment typos ;)
2009-03-26 18:23:43 +01:00
Andreas Schneider
e948cf6880
Document all public functions.
2009-03-26 11:24:34 +01:00
Andreas Schneider
3c618a3d7d
Add possibility to pass userdata to the auth function.
2009-03-26 11:09:46 +01:00
Andreas Schneider
c826f021d6
Improve the version function.
2009-03-26 10:40:16 +01:00
Andreas Schneider
20048b238d
Cosmetic change for a define.
2009-03-26 10:27:04 +01:00
Andreas Schneider
25f83f1764
Cleanup dirname and basename code.
2009-03-18 20:19:37 +01:00
Andreas Schneider
0634e0fdea
Don't require a C++ compiler.
2009-03-18 10:55:14 +01:00
Andreas Schneider
467c082368
Set version to 0.42.0.
2009-02-10 12:50:26 +01:00
Andreas Schneider
a18202744d
Change versions to 0.42.0 rc3 and add changelog entries.
2009-01-23 14:44:54 +01:00
Andreas Schneider
dd23c4ecbf
Add some comments.
2009-01-23 14:10:08 +01:00