[whimsy] branch master updated: correct merge logic

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new a219933  correct merge logic
a219933 is described below

commit a2199337c66191fdb9616fa964e0c6a63061d3f8
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Nov 16 15:26:06 2017 -0500

    correct merge logic
---
 www/secretary/workbench/views/index.js.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/secretary/workbench/views/index.js.rb b/www/secretary/workbench/views/index.js.rb
index 95a712c..46c2d0a 100644
--- a/www/secretary/workbench/views/index.js.rb
+++ b/www/secretary/workbench/views/index.js.rb
@@ -148,12 +148,14 @@ class Index < Vue
   def merge(messages)
     messages.each do |new_message|
       index = @messages.find_index do |old_message| 
-        old_message.time+old_message.hash <= new_message.time+new_message.hash
+        old_message.time < new_message.time or
+        (old_message.time == new_message.time and
+         old_message.href <= new_message.href)
       end
 
       if index == -1
         @messages << new_message
-      elsif @messages[index].hash == new_message.hash
+      elsif @messages[index].href == new_message.href
         @messages[index] = new_message
       else
         @messages.splice index, 0, new_message

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].