[MPlayer-dev-eng] svn policy change [RFC][PATCH]

[Diego Biurrun]

On Fri, Aug 11, 2006 at 09:20:59PM +0200, Michael Niedermayer wrote:
> 
> On Fri, Aug 11, 2006 at 06:07:33PM +0200, Diego Biurrun wrote:
> > On Sun, Aug 06, 2006 at 10:03:31PM +0200, Michael Niedermayer wrote:
> > > 
> > > --- svn-howto.txt	(revision 19349)
> > > +++ svn-howto.txt	(working copy)
> > > @@ -145,11 +152,10 @@
> > >  
> > >  9. Reverting broken commits
> > >  
> > > -  There is no Subversion equivalent of the 'cvs admin -o' command. Instead,
> > > -  be very careful about what you commit! If somehow you broke something,
> > > -  revert the changes locally and re-commit with a proper commit message.
> > > -  You may want to use 'svn cat -r<revision> <filename>' to inspect an older
> > > -  revision.
> > > +  You can revert a change by using svn copy from an old revision or by 
> > > +  reversing the change locally and re-commiting with a proper commit message.
> > > +  if the change was total nonsense like a policy violation or someone
> > > +  commiting the wrong file then svn copy is the correct way to reverse
> > 
> > How about
> > 
> >   Subversion does not support completely removing revisions. If you
> >   goofed up badly you can use 'svn merge' to undo changes from a
> >   revision locally.  Say the bad revision is 12345, then do
> > 
> >   svn merge -r 12345:12344 .
> >   svn commit
> > 
> >   from the root of the source dir. If in doubt, ask on the
> >   mplayer-dev-eng mailing list before making an even bigger mess. After
> >   undoing your changes in this way you can implement the proper solution
> >   and commit as usual.
> 
> strongly disagree, this is identical to the current problematic text
> 
> its problematic as it makes reversals much harder to review, every reversal
> would need to be manualy checked by someone to ensure that its really
> reversing what it claims to reverse ...

Assuming that 12345 is the bad revision and it got reverted in 12350,
the following command should do the trick:

svn diff -r 12344:12350 stream

It will return no output if there were no changes.

Diego