[mplayerosx-devel] Merging OSX Extended

[Adrian Stutz]

On Mon, May 11, 2009 at 11:29 PM, Guillaume POIRIER <poirierg at gmail.com> wrote:
> I put him in CC in case he wants to take part to the discussion.

Mailman tells me Nicolas is subscribed to the list, I hope he doesn't
have it on an ignore filter. :)

> Pulling small, self-contained changes from your fork may be a chance
> to "proofread" your own code, giving your a chance to improve the
> overall quality of the code that you pull....

I definitely see the benefits of merging small changes. It's just
quite a lot of changes, including inter-dependent ones that won't be
straight forward to merge independently.

> I don't know how much code/work you've put towards your fork, but this
> "merging" method may be worthwhile after all....

I just tried to use diffstat:
$ svn diff -r 1:HEAD | diffstat
57 files changed, 17819 insertions(+), 1367 deletions(-)

As comparison, MPlayer's last month:
$ svn diff -r {2009-04-11}:{2009-05-11} | diffstat
170 files changed, 5231 insertions(+), 3969 deletions(-)

As a rough estimate, Extended has 28.8% insertions and 2.9% deletions
of the MPlayer volume.

> Well, you can hardly call that merging OSX Extended, can you? (which
> is the title of the mailing list thread!)

Well, sure. I just wanted to get responses on the different options,
even alternatives to merging.

> In the end, I'm not the one making decisions, I'm just trying to help
> you conform to how things are done on MPlayer and FFmpeg projects.
> I'm happier if you ignore my advices and work heavily on MPlayerOSX to
> make it a lot better than having you run away because of the rules are
> too hard to work with.

Well, I'm not planning to run away. :)
I'm just trying to figure out what the best way could be and
appreciate any input.

Greetings
Adrian