[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 05:30:01PM +0300, Uoti Urpala wrote:
> On Fri, 2006-08-11 at 15:49 +0200, Diego Biurrun wrote:
> > IMO 'svn merge' is the correct solution here.
> 
> Does this comment have some practical meaning? "svn merge" has no direct
> effect on the repository; it's just another way to create local changes,
> comparable to using an editor or patching manually. Did you mean some
> particular kind of changes to be created with "svn merge" or whatever
> method?

What I'm trying to say here is that Benjamin should undo his changes
with the use of svn merge, commit, and then implement the proper
solution.

Diego