[MPlayer-cvslog] CVS: main mencoder.c,1.311,1.312

[Rich Felker]

On Fri, Oct 21, 2005 at 09:31:12PM +0200, Diego Biurrun wrote:
> On Fri, Oct 21, 2005 at 03:10:08PM -0400, Rich Felker wrote:
> > On Fri, Oct 21, 2005 at 11:12:30AM +0200, Diego Biurrun wrote:
> > > On Thu, Oct 20, 2005 at 11:22:21PM -0400, Rich Felker wrote:
> > > > 
> > > > Arrg, 100l to me for not noticing this unrelated uncommitted change I
> > > > had in mencoder.c!!! It's actually correct I think; however it wasn't
> > > > related. Should I do some sort of reverse, or just leave it, or...?
> > > 
> > > I'd say revert and recommit properly.  You can then decide what to do
> > > with the other change.
> > 
> > But not with cvs admin -o, right?
> 
> I don't much care.  This is one of those few cases where policy would
> allow it.  Your call.

IMO it's been too long and would corrupt people's checkouts. I would
have used cvs admin -o if I'd noticed it right away but since I didn't
I'll just reverse manually.

Or... could I commit a patch removing the incorrect lines, then cvs
admin -o 1.312 to merge the two together and remove the offending
stuff from cvs history? :)

Rich