[Ffmpeg-devel] Re: Fumble. please DO NOT commit anything right now

[Diego Biurrun]

On Wed, Dec 13, 2006 at 12:55:46AM +0100, Guillaume POIRIER wrote:
> 
> On 12/13/06, Michael Niedermayer <michaelni at gmx.at> wrote:
> >
> >On Tue, Dec 12, 2006 at 11:53:18PM +0100, Guillaume POIRIER wrote:
> >>
> >> On 12/12/06, Guillaume POIRIER <poirierg at gmail.com> wrote:
> >> >Hi there,
> >> >I wrongfully assume that X11 grabber patch apply script was a smooth
> >> >ride, and I was wrong. I need to revert all changes concerning X11
> >> >grabber. In the meantime, please do not commit anything, please.
> >>
> >> Mmm... I don't understand what happened. I had a fair deal of erros
> >> printed on my console, but the diff I got from the ML seem to match
> >> the ones provived in Edouard's tarball, so it looks like this was a
> >> false alarm.
> >
> >hmm maybe you should post the error messages here?
> 
> there you go:
> 
> ./apply.sh
> Applying feature-x11grab-improvement-1.patch
> =========================
> patching file libavformat/x11grab.c
> Hunk #3 succeeded at 60 (offset 1 line).
> Hunk #4 FAILED at 425.
> 1 out of 4 hunks FAILED -- saving rejects to file libavformat/x11grab.c.rej
> Sending        libavformat/x11grab.c
> Transmitting file data .
> Committed revision 7294.

WTF?  You committed patches that applied with rejects?

> So now I know I really need to revert these patches but I don't know
> how I'm supposed to o that with svn. svn revert only reverts local
> changes...

See DOCS/tech/svn-howto.txt.

Diego