2014-12-11 11:43 GMT+01:00 Denis Silakov <[email protected]>:

> sounds amazing! once you complete the urpmi and perl-urpm merge, I am
> going to suggest some patches from Rosa. Since currently we use urpmi from
> your branch:) and i still didn'tfind time to merge (or at least suggest)
> our patches to upstream code.
>
I'm not sure if you actually do though..

The branch I forked from /moondrake/urpmi to /software/urpmi had(/has?)
been overwritten earlier by you (I think)..

I think one of the reasons for why you happened to do so was that I threw
away the old git-svn repo imported from svn.mandriva.com and rather
switched to Mageia's.
When doing this, I reset the revision back to the last commit before
commits to their urpmi fork, then I did 'git format-path' from the same
revision on the git-svn branch.
After doing so, I applied all of those patches with 'git am' bringing the
branch back up to where it was, but this time with a git repo forked from
the same as Mageia's,
making it a lot easier to track their changes (I've also added support to
the Projects for automatically merging translations as well).

I've done similar for most of my branches (for those I haven't, I will),
and for all of those I've opened up so far, they can be found under
/software and won't be possible to
merge with repos under /omv_software.

So to everyone, please use the /software repos, this is where I'll be doing
my work (which for most of the repos, commits by me tends to make up the
majority), and also it'll
make it a lot easier to track and stay current with changes, translations
etc.

For people who wanna merge commits from other repos (ie. /omv_software or
mageia's), *please* generate these patches with 'git format-patch' and
apply them with 'git am'.

Commits like "merge all changes from Mageia" etc. isn't acceptable and I
will revert these on sight.

If anyone would happen to lack commit access to the /software repos and is
in need of it, please don't hesitate asking (although I've made some other
d00dz admins with permissions to grant access as well). :)

I hope People will find all of this acceptable and not get upset about me
reassuming (or at least trying to maintainership & responsibility over
these repos again, nor start silly fights over repository group location.

I simpy just want to be able to maintain, develop & tracking others'
Development as well in clean and sane manner to make the life of myself and
others more easy.
--
Regards,
Per Øyvind
_______________________________________________
OM-Cooker mailing list
[email protected]
http://ml.openmandriva.org/listinfo.cgi/om-cooker-openmandriva.org

Reply via email to