[Phpmyadmin-devel] Merging GSoC branches back
Hi all two of GSoC branches are now merged, the remaining ones are tomas and zahra. Is your common branch ready to get merged or each one should be processed separately? I did not yet review the code, I just ask what you two think about it. PS: Merging with svn is not as good as with git and with addition of slow and disconnecting sf.net servers it is really painful. I had to split commits because otherwise they did terminate SSL connection... -- Michal Čihař | http://cihar.com | http://blog.cihar.com
Michal Čihař a écrit :
Hi all
two of GSoC branches are now merged, the remaining ones are tomas and zahra. Is your common branch ready to get merged or each one should be processed separately? I did not yet review the code, I just ask what you two think about it.
I still need to test the tomas_zahra branch today.
PS: Merging with svn is not as good as with git and with addition of slow and disconnecting sf.net servers it is really painful. I had to split commits because otherwise they did terminate SSL connection...
Maybe this will be better from my side of the ocean...
------------------------------------------------------------------------
------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
------------------------------------------------------------------------
_______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
-- Marc Delisle http://infomarc.info
On 20.08.2009 15:41, Michal Čihař wrote:
Hi all
two of GSoC branches are now merged, the remaining ones are tomas and zahra. Is your common branch ready to get merged or each one should be processed separately? I did not yet review the code, I just ask what you two think about it.
PS: Merging with svn is not as good as with git and with addition of slow and disconnecting sf.net servers it is really painful. I had to split commits because otherwise they did terminate SSL connection...
great ... but Fehler SQL-Befehl: DokumentationBearbeiten SELECT tracking_active FROM WHERE `db_name` = 'aida_typo3_relaunch' AND `table_name` = 'be_groups' ORDER BY version DESC MySQL meldet: Dokumentation #1064 - You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHERE `db_name` = 'aida_typo3_relaunch' AND `table_name` = 'be_groups' ORDER B' at line 1 i think we should adjust the PMA relation configuration check script, ahm, or however it is named -- Sebastian Mendel
Hi Dne Fri, 21 Aug 2009 09:04:32 +0200 Sebastian Mendel <lists@sebastianmendel.de> napsal(a):
great ... but
Fehler SQL-Befehl: DokumentationBearbeiten
SELECT tracking_active FROM WHERE `db_name` = 'aida_typo3_relaunch' AND `table_name` = 'be_groups' ORDER BY version DESC
MySQL meldet: Dokumentation #1064 - You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHERE `db_name` = 'aida_typo3_relaunch' AND `table_name` = 'be_groups' ORDER B' at line 1
i think we should adjust the PMA relation configuration check script, ahm, or however it is named
Should be done now. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
participants (3)
-
Marc Delisle -
Michal Čihař -
Sebastian Mendel