From 9bd9949d68fa5f3e1f2af55ddac2eff6d6340194 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 23 Aug 2012 17:43:21 +0300 Subject: [PATCH] Fixed merge conflict, only one md5 needed. --- src/csync_private.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/csync_private.h b/src/csync_private.h index e01b43e78a..7f55b2213c 100644 --- a/src/csync_private.h +++ b/src/csync_private.h @@ -94,16 +94,16 @@ struct csync_s { char *uri; c_rbtree_t *tree; c_list_t *list; + c_list_t *id_list; enum csync_replica_e type; - unsigned long changes; } local; struct { char *uri; c_rbtree_t *tree; c_list_t *list; + c_list_t *id_list; enum csync_replica_e type; - unsigned long changes; } remote; struct { @@ -137,7 +137,7 @@ struct csync_s { /* error code of the last operation */ enum csync_error_codes_e error_code; - + int status; }; @@ -161,6 +161,7 @@ struct csync_file_stat_s { mode_t mode; /* u32 */ int nlink; /* u32 */ int type; /* u32 */ + char *destpath; /* for renames */ char *md5; enum csync_instructions_e instruction; /* u32 */