[Mageia-dev] sync with mandriva
shikamaru at mandriva.org
Sun Nov 7 13:53:30 CET 2010
On Sun, Nov 07, 2010 at 08:18:30AM +0200, P. Christeas wrote:
> On Sunday 07 November 2010, Luis Daniel Lucio Quiroz wrote:
> > Well,
> > as in mandriva list it seems that live will be again. I was wondering for
> > those we contrib in both distros. I mean for example me: i maintan squid
> > and snort (for example). I wonder if there is a way so i may affect
> > package once and build in both distros (because these packages for example
> > wont change, i mean patches and compiled options will be the same).
> Given that your squid could be built from /exactly/ the same package+tarballs
> in both Mandriva and Mageia, you could theoretically rsync between your 2
> local svn checkouts and then checkin.. But not the most beautiful procedure.
> BUT, if it had been for git-based package tracking:
> .. you would have 2 branches at the same git repo, for Mandriva, Mageia. And
> one, third, for the official upstream sources, actually. You would be able to
> hack one branch and let squid build, install etc. Then, you would /merge/ from
> one distro branch to the other, or cherry-pick, or rebase, or anything
> suitable for your changes. No need to have identical code in both of branches,
> at all.
> And then simply push to Mageia, Mandriva, Fedora, SuSe, Debian, the upstream
> squid etc, the N-th mirror of Mageia and so on...
> Moreover, if somebody else had hacked squid for Mandriva, you would be able to
> fetch his/her changes, merge the ones you wanted into Mageia, and repeat the
> "push" step.
> You see, having multiple masters, multiple committers is what git is unique
> at. It is where svn sucks, by contrast.
it could be possible as well with git-svn no ?
I don’t think mandriva will move to git anytime soon, it was planned
(IIRC spuk worked on it) but it was not finished.
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 230 bytes
Desc: not available
More information about the Mageia-dev