[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 Fri, Aug 11, 2006 at 09:53:00PM +0200, Reimar Döffinger wrote:
> On Fri, Aug 11, 2006 at 03:49:43PM +0200, Diego Biurrun wrote:
> > IMO 'svn merge' is the correct solution here.
> 
> Huh? I thought (part of) the problem was the lost history of tcp.c and
> udp.c, how is svn merge any help here? I personally ATM only see svn rm
> and svn cp after that as a possibility...

After using svn merge and backing out the commit it has to be redone
properly using svn cp to create tcp.c and udp.c with history...

Diego