[mplayerosx-devel] Merging OSX Extended

[Guillaume POIRIER]

Hi,

On Thu, May 7, 2009 at 11:54 PM, Adrian Stutz <adrian at sttz.ch> wrote:
>
> Hello OSX List,
>
> 10 months and 10 revisions ago I started the MPlayer OSX Extended
> branch, initially to add two options to the preferences but soon to
> add features and to fix things where they nagged me.
>
> I received various questions about merging my branch back to the main
> one. Branching ever really was only a way for me to get to know the
> project and to steadily advance on the way to keep my motivation.
>
> I think now would be a good time to merge Extended back into the main
> branch and I would like to get some feedback on this.
>
> What would be the preferred way to undertake this merge? My SVN
> history goes back to revision 5 but individual commits are quite big
> at the beginning. Should I just merge Extended in one go or merge
> individual releases?

MPlayer and FFmpeg developement rules require to commit changes in a
way that makes them as much readable and reviewable as possible.

So big changes are frown upon.

However, MPlayerOSX has been a one-man project so far (Nicolas
Plourde), and I'm not sure what rule he followed so far. It may be a
good idea to drop him a mail to has his that.


> On a separate note, the sourceforge project page of the original
> MPlayer OSX project is confusing a lot of people. Does anybody have
> access to the project to add a message that it's dead and been taken
> over by mplayerhq.hu?

Did you try using the contact page of sourceforge?

Guillaume
--
Only a very small fraction of our DNA does anything; the rest is all
comments and ifdefs.

Emma Goldman  - "If voting changed anything, they'd make it illegal."