#
#
# patch "src/monotone/MonotoneThread.cpp"
#  from [3696f27d199a112883ddd7a9f0262ae760c2107c]
#    to [108dcf4c1eca755f70892a76fe5014ef791e3984]
# 
# patch "src/monotone/MonotoneThread.h"
#  from [d4c4f289165b23192b2320242e7b89c874614f64]
#    to [63077cbecc190aab81276698cd375d67e4c42df8]
#
============================================================
--- src/monotone/MonotoneThread.cpp	3696f27d199a112883ddd7a9f0262ae760c2107c
+++ src/monotone/MonotoneThread.cpp	108dcf4c1eca755f70892a76fe5014ef791e3984
@@ -266,11 +266,13 @@ void MonotoneThread::run()
                 continue;
             }
 
+            buffer.clear();
+            output.clear();
             processingTask = true;
         }
 
         // FIXME: make this configurable!
-        if (!process->waitForReadyRead(10000))
+        if (!process->waitForReadyRead(30000))
         {
             emit aborted(threadNumber, process->error(),
                          QString::fromUtf8(process->readAllStandardError())
============================================================
--- src/monotone/MonotoneThread.h	d4c4f289165b23192b2320242e7b89c874614f64
+++ src/monotone/MonotoneThread.h	63077cbecc190aab81276698cd375d67e4c42df8
@@ -114,12 +114,9 @@ public:
     //! returns the thread's ident number
     inline int getThreadNumber() const { return threadNumber; }
 
-protected:
-    void run();
-
-public slots:
     //! enqueue a new task for this thread
     int enqueueTask(const MonotoneTask &);
+
     //! abort task execution on this thread
     /*!
         ATTENTION: all unfinished tasks will be aborted!
@@ -127,6 +124,9 @@ public slots:
     */
     void abort();
 
+protected:
+    void run();
+
 signals:
     //! signaled if a task has been finished
     void taskFinished(const MonotoneTask &);