[backend] fix timezone handling in .changes merge tool

src/api/test/fixtures/backend/source/kde4/kdelibs/kdelibs.changes.merged

@@ -1,15 +1,15 @@
 -------------------------------------------------------------------
-Thu Oct 30 09:57:13 UTC 2014 - adrian@suse.de
+Thu Oct 30 08:57:13 UTC 2014 - adrian@suse.de
 
 - new change upstream
 
 -------------------------------------------------------------------
-Thu Oct 30 09:57:11 UTC 2014 - adrian@suse.de
+Thu Oct 30 08:57:11 UTC 2014 - adrian@suse.de
 
 - new change in branch
 
 -------------------------------------------------------------------
-Sat Jun  3 00:00:00 UTC 2006 - adrian@suse.de
+Fri Jun  2 22:00:00 UTC 2006 - adrian@suse.de
 
 - One old entry
 

src/api/test/functional/source_controller_test.rb

@@ -2462,7 +2462,7 @@ def test_branch_and_merge_changes
     assert_response :success
     get '/source/home:Iggy/kdelibs_branch/kdelibs.changes?expand=1'
     assert_response :success
-    assert_equal @response.body, File.open("#{Rails.root}/test/fixtures/backend/source/kde4/kdelibs/kdelibs.changes.merged").read
+    assert_equal File.open("#{Rails.root}/test/fixtures/backend/source/kde4/kdelibs/kdelibs.changes.merged").read, @response.body
 
     #cleanup
     delete '/source/home:Iggy/kdelibs_branch'

src/backend/bs_mergechanges

@@ -89,7 +89,7 @@ my %entries;
 
 sub time2mystr {
   my ($time) = @_;
-  my @lt = localtime($time);
+  my @lt = gmtime($time);
   # ctime(3) format output
   return strftime("%a %b %e %H:%M:%S UTC %Y", @lt);
 }
@@ -133,7 +133,7 @@ while (@files) {
 
     unless($time) {
       my ($timestr, $emailstr) = split(' - ', $line, 2);
-      $time = str2time($timestr, "UTC");
+      $time = str2time($timestr);
       die("unable to parse time $line") unless $time;
       $email = $emailstr;
       die("unable to find email in time line") unless $email;
@@ -142,10 +142,12 @@ while (@files) {
     }
 
     if ($line eq $seperator) {
-      my @lt = localtime($time);
+      my @lt = gmtime($time);
       # check for the special case, we had many entries at 00:00:00 on same day in the past ...
+      # ignoring the hour due to timezone issues, but do not accept it anymore for current entries
       # we take this as one blob.
-      if ( $lt[0] != 0 || $lt[1] != 0 || $lt[2] != 0) {
+      # Accept this only for entries in 2006 and before with 00 minutes and 00 seconds
+      if ( $lt[5] > 106 || $lt[1] != 0 || $lt[0] != 0) {
         setentry($time, $email, $text);
         $text = ""; 
         $time = undef;