[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

[Uoti Urpala]

On Sat, 2006-08-05 at 15:29 +0200, Michael Niedermayer wrote:
> with cvs we could reverse changes, and try again, now if trojanized

In a way that broke existing checkouts, usually leaving harmful code in
them with no notice to the users. If you really need to do something
resembling that (which IMO you do not in any normal situation) you can
restore the repository from a backup and reapply wanted changes since
the backup.

> code got commited then reversal would remove it and a following clean
> change could be reviewd ... with svn it currently looks like we will
> flame and then go crying in a corner while leaving the change in svn
> this is not good at all and IMO overshadows any security advantage
> svn has over cvs ...

You can reverse commits by simply committing the previous version back.
In most cases (at least where the amount of changed of code is not huge)
this is a clearly better option. IMO cvs admin should not have been used
in several of the cases where it was used on MPlayer repository in the
past.

> maybe its possible to "reverse" changes by using branches?

Apparently svn cp supports copying from past versions of a file. That
should make it possible to make a version of a file that doesn't have
some changes in its own history. I haven't tested whether that can be
done cleanly, but I'd expect at least something like the following to
work:
1) make a tempfile as a copy of past version, 2) delete real file 3)
commit deletion (required before replacing file?) 4) copy tempfile where
original file was, 5) delete tempfile.
Obviously this shouldn't be used in the normal case; non-huge commits
should be reverted by simply committing a version which changes the code
back. But a commit which totally messes up a file could be removed from
the history of (the current version of) a file this way to preserve
annotate.