[MPlayer-cvslog] r19341 - in trunk/stream: Makefile asf_mmst_streaming.c asf_streaming.c network.c network.h pnm.c stream_ftp.c stream_netstream.c stream_rtsp.c stream_vstream.c tcp.c tcp.h

[Diego Biurrun]

On Mon, Aug 21, 2006 at 12:29:41PM +0200, Reimar Döffinger wrote:
> On Mon, Aug 21, 2006 at 12:11:52PM +0200, Diego Biurrun wrote:
> > I don't really like this solution because it requires two commits and it
> > will create a known-broken revision.  Without mplayer.c the project will
> > not compile, leading to avoidable problems and bogus bug reports.  Yes,
> > this does bite people, see
> 
> Now, if we look at the problem at hand I don't see how you could use svn
> merge without having this problem? And wouldn't it also lose the history
> that tcp.c was created from network.c?
> Really, your discussions are all nice but completely pointless, nobody
> even posted that _exact_ commands they propose to fix _this_ problem,
> instead leaving everyone more confused that at the beginning.
> So everyone please stop discussing _theoretical_ problems and start
> looking at _this one_. Afterwards you may take the next 70 years to
> discuss everything else.

Well, this has been discussed on IRC with no real resolution.  Do you
still feel the need to have this reversed and redone properly?

Diego