[FFmpeg-soc] [soc]: r5215 - in concat: Changelog.diff libavformat/Makefile.diff libavformat/allformats.c.diff libavformat/utils.c.diff upstreamrev

[Diego Biurrun]

On Sun, Aug 23, 2009 at 11:40:50PM +0200, gkovacs wrote:
> 
> --- concat/Changelog.diff	Sat Aug 22 07:43:33 2009	(r5214)
> +++ concat/Changelog.diff	Sun Aug 23 23:40:50 2009	(r5215)
> -@@ -32,6 +32,8 @@ version <next>:
> +@@ -32,8 +32,13 @@ version <next>:
>   - RTMP support in libavformat
>   - noX handling for OPT_BOOL X options
>   - Wave64 demuxer
> ++<<<<<<< HEAD
>  +- playlist API and concatenation support for ffmpeg
>  +- demuxers for M3U, PLS, and XSPF playlist formats
> ++=======
> + - IEC-61937 compatible Muxer
> + - TwinVQ decoder
> ++>>>>>>> 6a3f0e960e6e07079743821db16a238754b5f7a3

So you did three things

1) Tell Subversion that you had resolved a conflict when in fact you had
   not taken any action.
2) Not look over the diff once more before committing.
3) Record your neglicence for posterity in the annals of FFmpeg.

Take good note that I do not know any dev that does not double-check
the diffs before committing.  We are just not fond of 3).

Diego