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
81
82
83
84
85
86
87
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] sync with mandriva
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20sync%20with%20mandriva&In-Reply-To=%3C20101108111259.GR6343%40morley.gre.hp.com%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="001412.html">
<LINK REL="Next" HREF="001407.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] sync with mandriva</H1>
<B>Bruno Cornec</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20sync%20with%20mandriva&In-Reply-To=%3C20101108111259.GR6343%40morley.gre.hp.com%3E"
TITLE="[Mageia-dev] sync with mandriva">Bruno.Cornec at hp.com
</A><BR>
<I>Mon Nov 8 12:12:59 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="001412.html">[Mageia-dev] sync with mandriva
</A></li>
<LI>Next message: <A HREF="001407.html">[Mageia-dev] sync with mandriva
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1406">[ date ]</a>
<a href="thread.html#1406">[ thread ]</a>
<a href="subject.html#1406">[ subject ]</a>
<a href="author.html#1406">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>P. Christeas said on Sun, Nov 07, 2010 at 08:18:30AM +0200:
><i> .. you would have 2 branches at the same git repo, for Mandriva, Mageia. And
</I>><i> one, third, for the official upstream sources, actually. You would be able to
</I>><i> hack one branch and let squid build, install etc. Then, you would /merge/ from
</I>><i> one distro branch to the other, or cherry-pick, or rebase, or anything
</I>><i> suitable for your changes. No need to have identical code in both of branches,
</I>><i> at all.
</I>><i> And then simply push to Mageia, Mandriva, Fedora, SuSe, Debian, the upstream
</I>><i> squid etc, the N-th mirror of Mageia and so on...
</I>><i> Moreover, if somebody else had hacked squid for Mandriva, you would be able to
</I>><i> fetch his/her changes, merge the ones you wanted into Mageia, and repeat the
</I>><i> "push" step.
</I>><i> You see, having multiple masters, multiple committers is what git is unique
</I>><i> at. It is where svn sucks, by contrast.
</I>
That's a bit why a developed project-builder.org in fact, to separate
that dev and ease it. Maybe a possibility to look for the
mageia/mandriva tracks (Cf: <A HREF="http://project-builder.org">http://project-builder.org</A>)
Bruno.
--
Open Source & Linux Profession Lead EMEA / <A HREF="http://opensource.hp.com">http://opensource.hp.com</A>
HP/Intel/Red Hat Open Source Solutions Initiative / <A HREF="http://www.hpintelco.net">http://www.hpintelco.net</A>
<A HREF="http://www.HyPer-Linux.org">http://www.HyPer-Linux.org</A> <A HREF="http://mondorescue.org">http://mondorescue.org</A> <A HREF="http://project-builder.org">http://project-builder.org</A>
La musique ancienne? <A HREF="http://www.musique-ancienne.org">http://www.musique-ancienne.org</A> <A HREF="http://www.medieval.org">http://www.medieval.org</A>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001412.html">[Mageia-dev] sync with mandriva
</A></li>
<LI>Next message: <A HREF="001407.html">[Mageia-dev] sync with mandriva
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1406">[ date ]</a>
<a href="thread.html#1406">[ thread ]</a>
<a href="subject.html#1406">[ subject ]</a>
<a href="author.html#1406">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
