gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_Kolab__Server_HK_GW_FixBodyHeaderBreakInTestDriver.diff, 1.1, 1.2 t_imp_H_GW_DefaultLoginView.diff, 1.1, 1.2 t_imp_H_GW_LoginRetries.diff, 1.1, 1.2 t_kronolith_HK_GW_FbviewRelevance.diff, 1.1, 1.2 t_kronolith_HK_GW_XfbAccess.diff, 1.1, 1.2 t_kronolith_HK_SB_SaveEventAttendees.diff, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Sun Apr 26 00:51:12 CEST 2009 

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB
In directory doto:/tmp/cvs-serv32322/1.2.0/KOLAB

Modified Files:
	t_Kolab__Server_HK_GW_FixBodyHeaderBreakInTestDriver.diff 
	t_imp_H_GW_DefaultLoginView.diff t_imp_H_GW_LoginRetries.diff 
	t_kronolith_HK_GW_FbviewRelevance.diff 
	t_kronolith_HK_GW_XfbAccess.diff 
	t_kronolith_HK_SB_SaveEventAttendees.diff 
Log Message:
Sync the topgit queue with the patch directory. No patch changes were introduced - only merges that left the contents untouched.

Index: t_Kolab__Server_HK_GW_FixBodyHeaderBreakInTestDriver.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/t_Kolab__Server_HK_GW_FixBodyHeaderBreakInTestDriver.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_Kolab__Server_HK_GW_FixBodyHeaderBreakInTestDriver.diff	25 Apr 2009 21:04:19 -0000	1.1
+++ t_Kolab__Server_HK_GW_FixBodyHeaderBreakInTestDriver.diff	25 Apr 2009 22:51:10 -0000	1.2
@@ -25,7 +25,7 @@
                        'body' => substr($msg, $split + 3));
          return $this->_appendMessage($mail);
 -- 
-tg: (9cfd718..) t/Kolab_Server/HK/GW/FixBodyHeaderBreakInTestDriver (depends on: t/imp/H/GW/LoginRetries)
+tg: (563a168..) t/Kolab_Server/HK/GW/FixBodyHeaderBreakInTestDriver (depends on: t/imp/H/GW/LoginRetries)
 -- 
 TOPGIT patch commit log
 =======================

Index: t_imp_H_GW_DefaultLoginView.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/t_imp_H_GW_DefaultLoginView.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_imp_H_GW_DefaultLoginView.diff	25 Apr 2009 21:04:19 -0000	1.1
+++ t_imp_H_GW_DefaultLoginView.diff	25 Apr 2009 22:51:10 -0000	1.2
@@ -14,7 +14,7 @@
  3 files changed, 11 insertions(+), 1 deletions(-)
 
 diff --git a/horde-webmail/imp/config/conf.php b/horde-webmail/imp/config/conf.php
-index 3a0f1d6..6cea64b 100644
+index 3a0f1d6..b0d8772 100644
 --- a/horde-webmail/imp/config/conf.php
 +++ b/horde-webmail/imp/config/conf.php
 @@ -13,6 +13,7 @@ $conf['user']['allow_resume_all'] = false;
@@ -63,6 +63,12 @@
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 580072bc0b627e05bfe3053efbd31b4215019923
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Mar 26 19:22:37 2009 +0000
+
+    Merge change from http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/horde-webmail/1.2.0/tg/t_imp_H_GW_DefaultLoginView.diff.diff?r1=1.3&r2=1.4
 
 commit e2430d5bafced289bb0b8ac9d073fca9a4e9bb4a
 Author: Gunnar Wrobel <p at rdus.de>

Index: t_imp_H_GW_LoginRetries.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/t_imp_H_GW_LoginRetries.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_imp_H_GW_LoginRetries.diff	25 Apr 2009 21:04:19 -0000	1.1
+++ t_imp_H_GW_LoginRetries.diff	25 Apr 2009 22:51:10 -0000	1.2
@@ -30,7 +30,7 @@
      );
  }
 -- 
-tg: (4f99941..) t/imp/H/GW/LoginRetries (depends on: t/imp/H/GW/DefaultLoginView)
+tg: (580072b..) t/imp/H/GW/LoginRetries (depends on: t/imp/H/GW/DefaultLoginView)
 -- 
 TOPGIT patch commit log
 =======================

Index: t_kronolith_HK_GW_FbviewRelevance.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/t_kronolith_HK_GW_FbviewRelevance.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_kronolith_HK_GW_FbviewRelevance.diff	25 Apr 2009 21:04:19 -0000	1.1
+++ t_kronolith_HK_GW_FbviewRelevance.diff	25 Apr 2009 22:51:10 -0000	1.2
@@ -71,18 +71,18 @@
          if ($original_name != $this->_vars->get('name')) {
              $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));
 -- 
-tg: (67b6582..) t/kronolith/HK/GW/FbviewRelevance (depends on: t/kronolith/HK/SB/ExtraParameters)
+tg: (2b89751..) t/kronolith/HK/GW/FbviewRelevance (depends on: t/kronolith/HK/SB/ExtraParameters)
 -- 
 TOPGIT patch commit log
 =======================
 
-commit dae3753e368fefa0e825f97b03b146bb7f9fc44a
+commit 0175a71d1238e9b6907c31b7b97430dd7fc0486e
 Author: Gunnar Wrobel <p at rdus.de>
-Date:   Fri Mar 13 01:25:36 2009 +0100
+Date:   Sat Mar 14 01:10:44 2009 +0100
 
     Remove stray .orig file.
 
-commit adae108bd20332a0383b10ecbc0123d6d5c00fed
+commit 6aba4a0d6a6d139204db96eeff2569528088b265
 Author: Gunnar Wrobel <p at rdus.de>
 Date:   Sun Feb 1 22:27:55 2009 +0000
 

Index: t_kronolith_HK_GW_XfbAccess.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/t_kronolith_HK_GW_XfbAccess.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_kronolith_HK_GW_XfbAccess.diff	25 Apr 2009 21:04:19 -0000	1.1
+++ t_kronolith_HK_GW_XfbAccess.diff	25 Apr 2009 22:51:10 -0000	1.2
@@ -150,18 +150,12 @@
   <td colspan="7"> </td>
  </tr>
 -- 
-tg: (d2b5eee..) t/kronolith/HK/GW/XfbAccess (depends on: t/kronolith/HK/GW/FbviewRelevance)
+tg: (0175a71..) t/kronolith/HK/GW/XfbAccess (depends on: t/kronolith/HK/GW/FbviewRelevance)
 -- 
 TOPGIT patch commit log
 =======================
 
-commit 56a0438a5135d9dc3cde040531ad8d7dbc654f8c
-Author: Gunnar Wrobel <p at rdus.de>
-Date:   Fri Mar 13 01:27:45 2009 +0100
-
-    Remove stray .orig file.
-
-commit a6a8bb95cc237651c51fa16bd64dd30f122553bf
+commit 2d1588fad36f7b13bb534d70f14aa4f75ef8d35f
 Author: Gunnar Wrobel <p at rdus.de>
 Date:   Sun Feb 1 22:29:11 2009 +0000
 

Index: t_kronolith_HK_SB_SaveEventAttendees.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/t_kronolith_HK_SB_SaveEventAttendees.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_kronolith_HK_SB_SaveEventAttendees.diff	25 Apr 2009 21:04:19 -0000	1.1
+++ t_kronolith_HK_SB_SaveEventAttendees.diff	25 Apr 2009 22:51:10 -0000	1.2
@@ -286,13 +286,13 @@
 TOPGIT patch commit log
 =======================
 
-commit 917327fa2943eff049d5cb98cd33ffcb8cea880c
+commit cd7f4fe16072b7b40a1a75bd5c9a296e23bca779
 Author: Gunnar Wrobel <p at rdus.de>
-Date:   Fri Mar 13 07:44:50 2009 +0100
+Date:   Sat Mar 14 01:10:10 2009 +0100
 
     Remove stray .orig file.
 
-commit 026a99dd501ffc926853a2d8af9a7cdd7e30c9a0
+commit e508e429dcac35ef7ac223c771a9973f823db53f
 Author: Gunnar Wrobel <p at rdus.de>
 Date:   Sun Feb 1 22:21:11 2009 +0000

More information about the commits mailing list