[Kolab-devel] Horde webmail patch management for the Kolab web client

[Gunnar Wrobel]

Quoting Gunnar Wrobel <wrobel at pardus.de>:

> Quoting Thomas Arendsen Hein <thomas at intevation.de>:
>
>> * Gunnar Wrobel <wrobel at pardus.de> [20090111 22:36]:
>>> The single patches required for the Kolab web client (based on   
>>> Horde) can be found here:
>>>
>>> http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE/
>>
>> I'm getting "abort: consistency error adding group!" when trying to
>> clone it, and I remember getting this in the past (December 2008?),
>> too.
>
> Hm, I admit I never tried cloning from that url.
>
>>
>> When doing minimal incremental pulls I noticed that the server is
>> running out of memory, see
>> http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE/rev/51
>
> Hrm.
>
>>
>>> The reason why Mathieu asked about this is because he considers  
>>> the  big monolithic patch in Kolab CVS problematic to track.
>>
>>> I still believe this is the best way to go. But on the other hand   
>>> the way from the mercurial repository linked above to the final   
>>> patch may be somewhat obscure. Do people have better ideas? Or   
>>> should I just
>>> document it better in the wiki? Hoping for comments ;)
>>
>> combinediff from the patchutils package could be used to
>> automatically create the monolithic patch:
>> cat series | xargs combinediff
>
> As I'm moving to Horde 4 soon (and that includes moving away from   
> patch management with mercurial) I guess I won't fix the problems  
> you  mentioned but rather get the current patch queue into Kolab CVS.
>
> The ongoing development on Horde 4 could then be followed using git.  
>  But I still have to get this set up.

I was able to do this quicker than I anticipated. git is a nice tool indeed.

So for everyone interested in the history and / or bleeding edge of  
the kolab-webclient (based on Horde) development:

  - The project repository now resides at

    http://github.com/wrobel/horde-release/tree/master

  - You can easily clone the repository by running

    git clone git://github.com/wrobel/horde-release.git

  - The repository provides a topgit (http://repo.or.cz/w/topgit.git)  
controlled
    patch queue. Don't bother to fully understand topgit (though it is  
definitely
    worth it) if you just want to follow kolab-webclient HEAD. To track the
    latest state of the patch queue for the kolab-webclient you need to run
    within the repository you checked out above:

    git checkout -b kolab origin/t/KOLAB

    This will checkout the remote branch "t/KOLAB" (which is a  
combination of all
    the required patches) into the local branch named  "kolab". In  
order to stay
    up-to-date after that you just need to run:

    git pull

    (as long as you stay on the "kolab" branch. Otherwise issue a "git checkout
     kolab" before pulling).

  - If you are interested in topgit, you can also clone the full patch queue by
    running

    tg remote --populate origin

    from within the original checkout. This will fetch all patches.

  - If you copy /kolab/var/kolab/www/client/config/kolab.php and
    /kolab/var/kolab/www/client/kronolith/config/kolab.php to the respective
    places in your copy of the "t/KOLAB" branch then you should be able to use
    this checkout as a standard kolab-webclient and can test the newest
    fixes/features.

    This might also be the method I will soon recommend for setting up external
    web client installations.

At the current stage the whole thing is not yet very well tested, but  
I effectively switched over to the new patch management and I assume  
this to be useable soon.

Cheers,

Gunnar

>
> Cheers,
>
> Gunnar
>
>>
>> Thomas
>>
>> --
>> thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key:  
>>  0x5816791A
>> Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck,  
>>  HR B 18998
>> Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner
>>
>
>
>
> -- 
> ______ http://kdab.com _______________ http://kolab-konsortium.com _
>
> p at rdus Kolab work is funded in part by KDAB and the Kolab Konsortium
>
> ____ http://www.pardus.de _________________ http://gunnarwrobel.de _
> E-mail : p at rdus.de                                 Dr. Gunnar Wrobel
> Tel.   : +49 700 6245 0000                          Bundesstrasse 29
> Fax    : +49 721 1513 52322                          D-20146 Hamburg
> --------------------------------------------------------------------
>    >> Mail at ease - Rent a kolab groupware server at p at rdus <<
> --------------------------------------------------------------------
>
>
> ----------------------------------------------------------------
> This message was sent using IMP, the Internet Messaging Program.
>



-- 
______ http://kdab.com _______________ http://kolab-konsortium.com _

p at rdus Kolab work is funded in part by KDAB and the Kolab Konsortium

____ http://www.pardus.de _________________ http://gunnarwrobel.de _
E-mail : p at rdus.de                                 Dr. Gunnar Wrobel
Tel.   : +49 700 6245 0000                          Bundesstrasse 29
Fax    : +49 721 1513 52322                          D-20146 Hamburg
--------------------------------------------------------------------
    >> Mail at ease - Rent a kolab groupware server at p at rdus <<
--------------------------------------------------------------------


----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digitale PGP-Unterschrift
URL: <http://lists.kolab.org/pipermail/devel/attachments/20090202/3bd19962/attachment.sig>