3 files changed, 42 insertions, 0 deletions
diff --git a/lib/backupclient/BackupClientRestore.cpp b/lib/backupclient/BackupClientRestore.cpp
index fa61bb59..f6b42af9 100644
--- a/lib/backupclient/BackupClientRestore.cpp
+++ b/lib/backupclient/BackupClientRestore.cpp
@@ -22,7 +22,11 @@
 #include <errno.h>
 
 #include "BackupClientRestore.h"
+<<<<<<< HEAD
 #include "autogen_BackupProtocolClient.h"
+=======
+#include "autogen_BackupProtocol.h"
+>>>>>>> 0.12
 #include "CommonException.h"
 #include "BackupClientFileAttributes.h"
 #include "IOStream.h"
@@ -443,8 +447,13 @@ static int BackupClientRestoreDir(BackupProtocolClient &rConnection,
 	// list of files which is appropriate to the restore type
 	rConnection.QueryListDirectory(
 		DirectoryID,
+<<<<<<< HEAD
 		Params.RestoreDeleted?(BackupProtocolClientListDirectory::Flags_Deleted):(BackupProtocolClientListDirectory::Flags_INCLUDE_EVERYTHING),
 		BackupProtocolClientListDirectory::Flags_OldVersion | (Params.RestoreDeleted?(0):(BackupProtocolClientListDirectory::Flags_Deleted)),
+=======
+		Params.RestoreDeleted?(BackupProtocolListDirectory::Flags_Deleted):(BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING),
+		BackupProtocolListDirectory::Flags_OldVersion | (Params.RestoreDeleted?(0):(BackupProtocolListDirectory::Flags_Deleted)),
+>>>>>>> 0.12
 		true /* want attributes */);
 
 	// Retrieve the directory from the stream following
@@ -569,6 +578,11 @@ static int BackupClientRestoreDir(BackupProtocolClient &rConnection,
 					if (Params.ContinueAfterErrors)
 					{
 						Params.ContinuedAfterError = true;
+<<<<<<< HEAD
+=======
+						// ensure that protocol remains usable
+						objectStream->Flush();
+>>>>>>> 0.12
 					}
 					else
 					{
@@ -839,8 +853,13 @@ static int BackupClientRestoreDir(BackupProtocolClient &rConnection,
 //
 // --------------------------------------------------------------------------
 int BackupClientRestore(BackupProtocolClient &rConnection,
+<<<<<<< HEAD
 	int64_t DirectoryID, const char *RemoteDirectoryName,
 	const char *LocalDirectoryName, bool PrintDots, bool RestoreDeleted,
+=======
+	int64_t DirectoryID, const std::string& RemoteDirectoryName,
+	const std::string& LocalDirectoryName, bool PrintDots, bool RestoreDeleted,
+>>>>>>> 0.12
 	bool UndeleteAfterRestoreDeleted, bool Resume,
 	bool ContinueAfterErrors)
 {
diff --git a/lib/backupclient/BackupClientRestore.h b/lib/backupclient/BackupClientRestore.h
index 311a15bd..79765f63 100644
--- a/lib/backupclient/BackupClientRestore.h
+++ b/lib/backupclient/BackupClientRestore.h
@@ -24,6 +24,7 @@ enum
 
 int BackupClientRestore(BackupProtocolClient &rConnection,
 	int64_t DirectoryID,
+<<<<<<< HEAD
 	const char *RemoteDirectoryName,
 	const char *LocalDirectoryName,
 	bool PrintDots = false,
@@ -31,6 +32,15 @@ int BackupClientRestore(BackupProtocolClient &rConnection,
 	bool UndeleteAfterRestoreDeleted = false,
 	bool Resume = false,
 	bool ContinueAfterErrors = false);
+=======
+	const std::string& RemoteDirectoryName,
+	const std::string& LocalDirectoryName,
+	bool PrintDots,
+	bool RestoreDeleted,
+	bool UndeleteAfterRestoreDeleted,
+	bool Resume,
+	bool ContinueAfterErrors);
+>>>>>>> 0.12
 
 #endif // BACKUPSCLIENTRESTORE__H
 
diff --git a/lib/backupclient/BackupDaemonConfigVerify.cpp b/lib/backupclient/BackupDaemonConfigVerify.cpp
index dfef5b03..3104ae8e 100644
--- a/lib/backupclient/BackupDaemonConfigVerify.cpp
+++ b/lib/backupclient/BackupDaemonConfigVerify.cpp
@@ -114,12 +114,25 @@ static const ConfigurationVerifyKey verifyrootkeys[] =
 	ConfigurationVerifyKey("NotifyAlways", ConfigTest_IsBool, false),
 	// option to disable the suppression of duplicate notifications
 
+<<<<<<< HEAD
+=======
+	ConfigurationVerifyKey("MaxUploadRate", ConfigTest_IsInt),
+	// optional maximum speed of uploads in kbytes per second
+
+	ConfigurationVerifyKey("TcpNice", ConfigTest_IsBool, false),
+	// optional enable of tcp nice/background mode
+
+>>>>>>> 0.12
 	ConfigurationVerifyKey("CertificateFile", ConfigTest_Exists),
 	ConfigurationVerifyKey("PrivateKeyFile", ConfigTest_Exists),
 	ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_Exists),
 	ConfigurationVerifyKey("KeysFile", ConfigTest_Exists),
 	ConfigurationVerifyKey("DataDirectory", 
 		ConfigTest_Exists | ConfigTest_LastEntry),
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0.12
 };
 
 const ConfigurationVerify BackupDaemonConfigVerify =