summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2010-November/000695.html
diff options
context:
space:
mode:
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000695.html')
-rw-r--r--zarb-ml/mageia-sysadm/2010-November/000695.html84
1 files changed, 84 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000695.html b/zarb-ml/mageia-sysadm/2010-November/000695.html
new file mode 100644
index 000000000..b7fd20e49
--- /dev/null
+++ b/zarb-ml/mageia-sysadm/2010-November/000695.html
@@ -0,0 +1,84 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+ <HEAD>
+ <TITLE> [Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
+ </TITLE>
+ <LINK REL="Index" HREF="index.html" >
+ <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B340%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C20101120150825.GA15726%40sisay.ephaone.org%3E">
+ <META NAME="robots" CONTENT="index,nofollow">
+ <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
+ <LINK REL="Previous" HREF="000693.html">
+ <LINK REL="Next" HREF="000764.html">
+ </HEAD>
+ <BODY BGCOLOR="#ffffff">
+ <H1>[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'</H1>
+ <B>Michael scherer</B>
+ <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B340%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C20101120150825.GA15726%40sisay.ephaone.org%3E"
+ TITLE="[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'">misc at zarb.org
+ </A><BR>
+ <I>Sat Nov 20 16:08:25 CET 2010</I>
+ <P><UL>
+ <LI>Previous message: <A HREF="000693.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
+</A></li>
+ <LI>Next message: <A HREF="000764.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#695">[ date ]</a>
+ <a href="thread.html#695">[ thread ]</a>
+ <a href="subject.html#695">[ subject ]</a>
+ <a href="author.html#695">[ author ]</a>
+ </LI>
+ </UL>
+ <HR>
+<!--beginarticle-->
+<PRE>On Sat, Nov 20, 2010 at 01:59:18PM +0100, Olivier Blin wrote:
+&gt;<i> Michael scherer &lt;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">misc at zarb.org</A>&gt; writes:
+</I>&gt;<i>
+</I>&gt;<i> &gt; On Sat, Nov 20, 2010 at 12:52:54PM +0100, <A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">root at mageia.org</A> wrote:
+</I>&gt;<i> &gt;&gt; Revision: 340
+</I>&gt;<i> &gt;&gt; Author: misc
+</I>&gt;<i> &gt;&gt; Date: 2010-11-20 12:52:54 +0100 (Sat, 20 Nov 2010)
+</I>&gt;<i> &gt;&gt; Log Message:
+</I>&gt;<i> &gt;&gt; -----------
+</I>&gt;<i> &gt;&gt; Merge remote branch 'vm_valstar/master'
+</I>&gt;<i> &gt;
+</I>&gt;<i> &gt; Oups :/
+</I>&gt;<i> &gt;
+</I>&gt;<i> &gt; Sorry, I (again) managed to do thing wrong with git merge.
+</I>&gt;<i> &gt; here is the list of change :
+</I>&gt;<i>
+</I>&gt;<i> Maybe you can use svn pe to fix the logs :)
+</I>
+Yup, good idea. I have used the default script
+to enable the change for svn:log.
+I will also try to find a script to send mail on change,
+and add it to the subversion::repository ressources I wrote.
+
+--
+Michael Scherer
+</PRE>
+
+
+
+
+
+<!--endarticle-->
+ <HR>
+ <P><UL>
+ <!--threads-->
+ <LI>Previous message: <A HREF="000693.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
+</A></li>
+ <LI>Next message: <A HREF="000764.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#695">[ date ]</a>
+ <a href="thread.html#695">[ thread ]</a>
+ <a href="subject.html#695">[ subject ]</a>
+ <a href="author.html#695">[ author ]</a>
+ </LI>
+ </UL>
+
+<hr>
+<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
+mailing list</a><br>
+</body></html>