summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-webteam/2011-January/000095.html
blob: 5a7f01823fcbabf6bca3eabcaeabcde237f9a509 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
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 &#224; 09:45 +0100, Romain d'Alverny a &#233;crit :
&gt;<i> On Thu, Jan 6, 2011 at 00:07, Michael Scherer &lt;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-webteam">misc at zarb.org</A>&gt; wrote:
</I>&gt;<i> &gt; some people asked us^W to have a trunk installation of catdap, and so
</I>&gt;<i> &gt; here it is :
</I>&gt;<i> &gt; <A HREF="https://identity-trunk.mageia.org/">https://identity-trunk.mageia.org/</A>
</I>&gt;<i> &gt;
</I>&gt;<i> &gt; Updated every 15 minutes, from trunk.
</I>&gt;<i> &gt;
</I>&gt;<i> &gt; yes, it look nicer than <A HREF="https://identity.mageia.org/">https://identity.mageia.org/</A> . I suspect the
</I>&gt;<i> &gt; merge didn't went as well as I thought.
</I>&gt;<i> 
</I>&gt;<i> I did the merge (from live to trunk, several weeks ago) but I believe
</I>&gt;<i> trunk evolved on its afterwise.
</I>&gt;<i>
</I>&gt;<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>