[Ffmpeg-devel] [PATCH] from DivX, Part 1: cosmectic changes

[Diego Biurrun]

On Thu, Dec 22, 2005 at 09:14:35AM +0100, Guillaume POIRIER wrote:
> 
> On 12/22/05, Diego Biurrun <diego at biurrun.de> wrote:
> 
> > OK, I've replaced all tabs with spaces along with some prettyprinting on
> > the code where it was necessary after the tab removal, in related places
> > and a few random places along the way.
> 
> How did you do it? Has it been pretty much been like running:
> expand | sed 's/ *$//' over the files, and removing all trailing spaces?

I just repeated

  find . -exec sed -i -e 's/ *$//' -e 's/	*$//' {} \;

a few times to remove all trailing whitespace.

I removed all tabs with

  find . -exec sed -i -e 's/	/        /g' {} \;

followed by

  rm cleandiff tests/lena.pnm
  find . -name Makefile -exec rm {} \;

All on a clean tree.  Then I looked at the ~60000 lines that 'cvs diff'
spit out in order to see where the conversion had messed up the
indentation and fixed that up by hand aided by a few emacs macros.  I
checked 'cvs diff -w' against goofups, fixed them and committed.

> I'm asking that so that the local patch(es) that I have on my tree can
> be easily updated.

Try the patch option -l/--ignore-whitespace.

Diego