Bug #1104

Fixed the bug where the sort order of transactions with equal timestamps
 was not stable, i.e. due to the lack of a total order, different merges
 produced different sortings and hence messed up transactions which
 have already been merged.

src/Taskmod.h

@@ -33,6 +33,8 @@
 #include <Task.h>
 
 class Taskmod {
+  friend bool compareTaskmod (Taskmod first, Taskmod second);
+
 public:
   Taskmod ();
   Taskmod (const Taskmod& other);
@@ -59,11 +61,13 @@ public:
   void setAfter (const Task& after);
   void setBefore (const Task& before);
   void setTimestamp (long timestamp);
+  void incSequenceNumber ();
 
   // getter
   Task& getAfter ();
   Task& getBefore ();
   long getTimestamp () const;
+  unsigned long getSequenceNumber () const;
   std::string getTimeStr () const;
 
 protected:
@@ -72,7 +76,12 @@ protected:
   long _timestamp;
   bool _bAfterSet;
   bool _bBeforeSet;
+  unsigned long _sequenceNumber;
+
+  static unsigned long curSequenceNumber;
 };
 
+bool compareTaskmod (Taskmod first, Taskmod second);
+
 #endif