diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-webteam/2011-January/000095.html | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-1be510f9529cb082f802408b472a77d074b394c0.tar archives-1be510f9529cb082f802408b472a77d074b394c0.tar.gz archives-1be510f9529cb082f802408b472a77d074b394c0.tar.bz2 archives-1be510f9529cb082f802408b472a77d074b394c0.tar.xz archives-1be510f9529cb082f802408b472a77d074b394c0.zip | |
Diffstat (limited to 'zarb-ml/mageia-webteam/2011-January/000095.html')
| -rw-r--r-- | zarb-ml/mageia-webteam/2011-January/000095.html | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/zarb-ml/mageia-webteam/2011-January/000095.html b/zarb-ml/mageia-webteam/2011-January/000095.html new file mode 100644 index 000000000..5a7f01823 --- /dev/null +++ b/zarb-ml/mageia-webteam/2011-January/000095.html @@ -0,0 +1,80 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-webteam] Catdap trunk instance, and update + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-webteam%40mageia.org?Subject=Re%3A%20%5BMageia-webteam%5D%20Catdap%20trunk%20instance%2C%20and%20update&In-Reply-To=%3C1294318127.3329.9.camel%40akroma.ephaone.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="000092.html"> + <LINK REL="Next" HREF="000093.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-webteam] Catdap trunk instance, and update</H1> + <B>Michael Scherer</B> + <A HREF="mailto:mageia-webteam%40mageia.org?Subject=Re%3A%20%5BMageia-webteam%5D%20Catdap%20trunk%20instance%2C%20and%20update&In-Reply-To=%3C1294318127.3329.9.camel%40akroma.ephaone.org%3E" + TITLE="[Mageia-webteam] Catdap trunk instance, and update">misc at zarb.org + </A><BR> + <I>Thu Jan 6 13:48:47 CET 2011</I> + <P><UL> + <LI>Previous message: <A HREF="000092.html">[Mageia-webteam] Catdap trunk instance, and update +</A></li> + <LI>Next message: <A HREF="000093.html">[Mageia-webteam] Webteam peers, bootstrapping +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#95">[ date ]</a> + <a href="thread.html#95">[ thread ]</a> + <a href="subject.html#95">[ subject ]</a> + <a href="author.html#95">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Le jeudi 06 janvier 2011 à 09:45 +0100, Romain d'Alverny a écrit : +><i> On Thu, Jan 6, 2011 at 00:07, Michael Scherer <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-webteam">misc at zarb.org</A>> wrote: +</I>><i> > some people asked us^W to have a trunk installation of catdap, and so +</I>><i> > here it is : +</I>><i> > <A HREF="https://identity-trunk.mageia.org/">https://identity-trunk.mageia.org/</A> +</I>><i> > +</I>><i> > Updated every 15 minutes, from trunk. +</I>><i> > +</I>><i> > yes, it look nicer than <A HREF="https://identity.mageia.org/">https://identity.mageia.org/</A> . I suspect the +</I>><i> > merge didn't went as well as I thought. +</I>><i> +</I>><i> I did the merge (from live to trunk, several weeks ago) but I believe +</I>><i> trunk evolved on its afterwise. +</I>><i> +</I>><i> So probably yes, no merge has been done from trunk to live afterwise. +</I> +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 + +</PRE> + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000092.html">[Mageia-webteam] Catdap trunk instance, and update +</A></li> + <LI>Next message: <A HREF="000093.html">[Mageia-webteam] Webteam peers, bootstrapping +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#95">[ date ]</a> + <a href="thread.html#95">[ thread ]</a> + <a href="subject.html#95">[ subject ]</a> + <a href="author.html#95">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-webteam">More information about the Mageia-webteam +mailing list</a><br> +</body></html> |