[MPlayer-dev-eng] reorganisation of the mplayer release branches

[Reinhard Tartler]

Hi Reimar, hi Diego,

I'd like to propose to change the layout of the mplayer release
branches. Currently they use svn:externals like this:

siretart at faui44a:/tmp $ svn propget svn:externals svn://svn.mplayerhq.hu/mplayer/branches/1.0rc1
svn propget svn:externals svn://svn.mplayerhq.hu/mplayer/branches/1.0rc1
libavutil -r6767	svn://svn.mplayerhq.hu/ffmpeg/trunk/libavutil
libavcodec -r6767	svn://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec
libavformat -r6767	svn://svn.mplayerhq.hu/ffmpeg/trunk/libavformat
libpostproc -r6767	svn://svn.mplayerhq.hu/ffmpeg/trunk/libpostproc

siretart at faui44a:/tmp $ svn propget svn:externals svn://svn.mplayerhq.hu/mplayer/branches/1.0rc2
svn propget svn:externals svn://svn.mplayerhq.hu/mplayer/branches/1.0rc2
libavutil -r10677	svn://svn.mplayerhq.hu/ffmpeg/trunk/libavutil
libavcodec -r10677	svn://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec
libavformat -r10677	svn://svn.mplayerhq.hu/ffmpeg/trunk/libavformat
libpostproc -r10677	svn://svn.mplayerhq.hu/ffmpeg/trunk/libpostproc

siretart at faui44a:/tmp $ svn propget svn:externals svn://svn.mplayerhq.hu/mplayer/branches/1.0rc3
svn propget svn:externals svn://svn.mplayerhq.hu/mplayer/branches/1.0rc3
libavutil	svn://svn.ffmpeg.org/ffmpeg/branches/0.5/libavutil
libavcodec	svn://svn.ffmpeg.org/ffmpeg/branches/0.5/libavcodec
libavformat	svn://svn.ffmpeg.org/ffmpeg/branches/0.5/libavformat
libpostproc	svn://svn.ffmpeg.org/ffmpeg/branches/0.5/libpostproc

libswscale -r 28777 svn://svn.ffmpeg.org/mplayer/trunk/libswscale

libdvdread4	svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src
libdvdnav	svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src

This makes integrating security fixes unnecessary hard. I therefore
propose to avoid svn:externals in release branches completely, and
instead *copy* (or rather import) the file contents of the respective
svn revision of the ffmpeg branch.

As a cornercase, the libswscale svn:external in the 1.0rc3 branch would
be replaced by a proper svn branch, starting with the matching revision,
of course.

As for merging/cherrypicking fixes, I intend to use git-svn to manage
that. Since after this proposed move no svn:external are used anymore,
this should be pretty painless.


Just to avoid misunderstandings: I do not propose to change anything to
the current mplayer development model. I also do not propose the change
anything in trunk/. What I propose is to aid updates in the mplayer
release branches only.

I'd appreciate comments, suggestions and flamewars on this :-)

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4