[Mageia-webteam] Catdap trunk instance, and update

[Michael Scherer]

Le jeudi 06 janvier 2011 à 09:45 +0100, Romain d'Alverny a écrit :
> On Thu, Jan 6, 2011 at 00:07, Michael Scherer <misc at zarb.org> wrote:
> > some people asked us^W to have a trunk installation of catdap, and so
> > here it is :
> > https://identity-trunk.mageia.org/
> >
> > Updated every 15 minutes, from trunk.
> >
> > yes, it look nicer than https://identity.mageia.org/ . I suspect the
> > merge didn't went as well as I thought.
> 
> I did the merge (from live to trunk, several weeks ago) but I believe
> trunk evolved on its afterwise.
>
> So probably yes, no merge has been done from trunk to live afterwise.

I did one yesterday see commit 212 and 211, without much success
despites reading the doc and using svn since years ( granted, i never do
merge ).

So I will fix it by hand, or do it with git-svn, whatever.

-- 
Michael Scherer