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
fdea54edc5
Fix the vim modlines.
2009-05-13 10:12:07 +02:00
Andreas Schneider
3c618a3d7d
Add possibility to pass userdata to the auth function.
2009-03-26 11:09:46 +01:00
Andreas Schneider
20048b238d
Cosmetic change for a define.
2009-03-26 10:27:04 +01:00
Andreas Schneider
dd23c4ecbf
Add some comments.
2009-01-23 14:10:08 +01:00
Andreas Schneider
c5104e8da3
Rename variable to unix_extensions.
2009-01-19 11:32:58 +01:00
Andreas Schneider
e0807cba1b
Add a check if we are operating remote on a unix filesystem.
...
This extends the exclude function. Maybe we should do this for the local
too.
2009-01-13 15:50:44 +01:00
Andreas Schneider
0681db0efe
Reduce system calls of getuid and geteuid.
2008-11-13 14:08:26 +01:00
Andreas Schneider
e5286c7c8a
Rename journal functions to statedb.
2008-07-09 10:10:00 +02:00
Andreas Schneider
8aed1cef83
Disable journal completely instead of writing and removing it.
2008-06-24 13:36:47 +02:00
Andreas Schneider
d7309c4ff9
Rename the callback function.
2008-06-24 13:36:27 +02:00
Andreas Schneider
7935d63098
Don't add deleted files to the journal.
2008-06-18 09:56:08 +02:00
Andreas Schneider
5168e3ee70
Change name of the buffersize so that they can't conflict.
2008-06-02 16:05:40 +02:00
Andreas Schneider
cce81bc154
Use a better name for the status defines.
2008-05-27 14:15:44 +02:00
Andreas Schneider
158ff9eba5
Create the journal depending on the name of the remote replica.
2008-05-27 13:48:07 +02:00
Andreas Schneider
d5aced82ca
Disable sync of symlinks cause they need a lot of work.
2008-05-26 17:09:42 +02:00
Andreas Schneider
66fd0e2de0
Add basic support for symbolic links.
...
A test to ensure that it is working is still needed.
2008-05-26 15:58:40 +02:00
Andreas Schneider
235b817de0
Add a directory cleanup function to the propagator.
2008-05-20 13:56:43 +02:00
Andreas Schneider
84bb336e8e
Add the file size to the file info struct.
2008-05-16 17:30:22 +02:00
Andreas Schneider
cfd587a260
Move the ftw type flags to the csync private header.
2008-05-16 14:12:00 +02:00
Andreas Schneider
e76495a5cc
Add a module auth callback function.
...
This allows the client to create an authentication callback function and
let the module call it. This makes it independent from gui or commandline.
2008-05-13 13:38:03 +02:00
Andreas Schneider
eadbaa76d5
Use the status flag for the synchronizer.
2008-04-29 11:20:52 +02:00
Andreas Schneider
98962337c4
Use a struct for the journal.
2008-04-29 09:23:51 +02:00
Andreas Schneider
80ee481af3
Add a type field to csync_file_stat.
2008-04-28 14:34:58 +02:00
Andreas Schneider
a1d32a2c8b
Rename pathid to phash and add current replica info.
2008-04-28 14:08:51 +02:00
Andreas Schneider
59ab78ed57
Add instructions and file structure for internal rbtree.
2008-04-28 10:16:31 +02:00
Andreas Schneider
3eeb70ea94
Add replica type to the replica structs.
2008-04-28 10:05:40 +02:00
Andreas Schneider
6d11fbd3c6
Fix remote tree name and free the memory of the replicas.
2008-04-23 13:05:40 +02:00
Andreas Schneider
dc72b7397c
Add the local and remote uri at creation time.
2008-04-22 17:23:26 +02:00
Andreas Schneider
9a97f52e4f
Add missing vio functions.
...
This is the last step to get the vio framework working.
2008-04-22 12:12:23 +02:00
Andreas Schneider
4644c39f5a
Implement module init and shutdown functions.
2008-04-17 18:02:41 +02:00
Andreas Schneider
9c90b113e8
Add config.h to csync_private.h and add plugin_handle.
2008-04-17 14:54:21 +02:00
Andreas Schneider
b4811c36bc
Add a stringlist expand function.
2008-03-20 10:34:58 +01:00
Andreas Schneider
ff7e28f82c
Completly hide the csync structure for the user of the library.
...
So it easier to change the API/ABI.
2008-02-29 11:41:15 +01:00
Andreas Schneider
1b29a420bc
Initial commit
2008-02-27 18:56:47 +01:00
