[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

[Michael Niedermayer]

Hi

On Sun, Aug 13, 2006 at 12:05:53PM +0200, Diego Biurrun wrote:
> On Fri, Aug 11, 2006 at 08:34:26PM +0200, Michael Niedermayer wrote:
> > 
> > On Fri, Aug 11, 2006 at 03:49:43PM +0200, Diego Biurrun wrote:
> > > On Thu, Aug 10, 2006 at 10:05:09AM +0200, Michael Niedermayer wrote:
> > > > 
> > > > On Wed, Aug 09, 2006 at 06:03:44PM +0300, Ivan Kalvachev wrote:
> > > > > 2006/8/6, Diego Biurrun <diego at biurrun.de>:
> > > > > >On Sat, Aug 05, 2006 at 07:50:26PM +0200, Dominik 'Rathann' Mierzejewski 
> > > > > >wrote:
> > > > > >>
> > > > > >> Instead of apologising (which is nice), why don't you
> > > > > >> go back and fix what you did wrong (which is useful).
> > > > > >> You were already given some tips on how to do this.
> > > > > >
> > > > > >I've told Ben to hold off for the moment while I investigate this.
> > > > 
> > > > could you elaborate on what you want to investigate? maybe others
> > > > can help than?
> > > > 
> > > > IMO the files should simply be svn cp from the correct revision and then 
> > > > any functional and cosmetic changes can be applied seperately
> > > 
> > > IMO 'svn merge' is the correct solution here.
> > 
> > and do you have any arguments for svn merge which is the same as 
> > local reverse + commit and against svn cp ?
> 
> Yes, svn merge works while svn cp doesn't.  With 'svn cp' you can only
> duplicate objects within the repository.  If you attempt to copy a file
> over itself Subversion will complain about "foo is in the way".
> 
> Don't take my word for it, try for yourself, I've made a copy of the
> MPlayer repo to play with:
> 
>   svn checkout svn://svn.mplayerhq.hu/mplayer.foo/trunk

while it wasnt easy, the following worked

1. change mplayer.c in an unacceptable way :)
2. svn ci mplayer.c

3. svn rm mplayer.c
4. svn ci mplayer.c
5. svn cp -r19361 svn://svn.mplayerhq.hu/mplayer.foo/trunk/mplayer.c mplayer.c
6. svn ci mplayer.c

if there are no objections then ill add that to svn-howto.txt soon

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In the past you could go to a library and read, borrow or copy any book
Today you'd get arrested for mere telling someone where the library is