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
88
89
90
91
92
93
94
95
|
<!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=%3C1289214265.25189.2.camel%40akroma.ephaone.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Next" HREF="001405.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] sync with mandriva</H1>
<B>Michael Scherer</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20sync%20with%20mandriva&In-Reply-To=%3C1289214265.25189.2.camel%40akroma.ephaone.org%3E"
TITLE="[Mageia-dev] sync with mandriva">misc at zarb.org
</A><BR>
<I>Mon Nov 8 12:04:25 CET 2010</I>
<P><UL>
<LI>Next message: <A HREF="001405.html">[Mageia-dev] sync with mandriva
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1404">[ date ]</a>
<a href="thread.html#1404">[ thread ]</a>
<a href="subject.html#1404">[ subject ]</a>
<a href="author.html#1404">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Le dimanche 07 novembre 2010 à 13:53 +0100, Remy CLOUARD a écrit :
><i> On Sun, Nov 07, 2010 at 08:18:30AM +0200, P. Christeas wrote:
</I>><i> > On Sunday 07 November 2010, Luis Daniel Lucio Quiroz wrote:
</I>><i> > > Well,
</I>><i> > >
</I>><i> > > as in mandriva list it seems that live will be again. I was wondering for
</I>><i> > > those we contrib in both distros. I mean for example me: i maintan squid
</I>><i> > > and snort (for example). I wonder if there is a way so i may affect
</I>><i> > > package once and build in both distros (because these packages for example
</I>><i> > > wont change, i mean patches and compiled options will be the same).
</I>><i> > Given that your squid could be built from /exactly/ the same package+tarballs
</I>><i> > in both Mandriva and Mageia[1], you could theoretically rsync between your 2
</I>><i> > local svn checkouts and then checkin.. But not the most beautiful procedure.
</I>><i> >
</I>><i> > BUT, if it had been for git-based package tracking:
</I>><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>><i> >
</I>><i> it could be possible as well with git-svn no ?
</I>><i>
</I>><i> I don’t think mandriva will move to git anytime soon, it was planned
</I>><i> (IIRC spuk worked on it) but it was not finished.
</I>
No, not on git, on a different system with separated svn for tarball.
Additionally, that's what we plan to deploy for mageia.
--
Michael Scherer
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Next message: <A HREF="001405.html">[Mageia-dev] sync with mandriva
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1404">[ date ]</a>
<a href="thread.html#1404">[ thread ]</a>
<a href="subject.html#1404">[ subject ]</a>
<a href="author.html#1404">[ 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>
|
