Simple patch q

[Jason Edmeades]

Hi, When I can I use cvs diff, but once I get a few patches out I end up 
diffing to the previous patch using diff -u3 backup_of_last_patch 
dlls/d3d8.

I always get lots of "Only in dlls/d3d8: basetexture.o, Only in 
dlls/d3d8: cubetexture.o etc" type lines - How can I get rid of these (I 
normally edit them out by hand but I forgot this time) - I looked in the 
man pages and nothing stood out.

Jason

[Vincent Béron]

Le jeu 30/10/2003 à 16:54, Jason Edmeades a écrit :
> Hi, When I can I use cvs diff, but once I get a few patches out I end up 
> diffing to the previous patch using diff -u3 backup_of_last_patch 
> dlls/d3d8.
>
> I always get lots of "Only in dlls/d3d8: basetexture.o, Only in 
> dlls/d3d8: cubetexture.o etc" type lines - How can I get rid of these (I 
> normally edit them out by hand but I forgot this time) - I looked in the 
> man pages and nothing stood out.

diff -x '*.o'?

Vincent

[Johan Dahlin]

> I always get lots of "Only in dlls/d3d8: basetexture.o, Only in 
> dlls/d3d8: cubetexture.o etc" type lines - How can I get rid of these (I 
> normally edit them out by hand but I forgot this time) - I looked in the 
> man pages and nothing stood out.

You can always filter them out with help of grep:

diff ... | egrep -v "^Only in"

[Jason Edmeades]

Johan Dahlin wrote:
> > I always get lots of "Only in dlls/d3d8: basetexture.o, Only in 
> > dlls/d3d8: cubetexture.o etc" type lines - How can I get rid of these
>
> You can always filter them out with help of grep:
>
> diff ... | egrep -v "^Only in"

Thanks - Thats what I was after - I knew it should be simple, but I 
'expected' a flag on diff!
Jason

[Mike Hearn]

On Thu, 30 Oct 2003 22:52:50 +0000, Sir Jason Edmeades scribed thus:
> Thanks - Thats what I was after - I knew it should be simple, but I 
> 'expected' a flag on diff!
> Jason

Well you can just ignore them you know - patch ignores garbage it doesn't
understand. Alternatively do what I do for winecfg and use the --exclude
option with an exclusions file.

thanks -mike

[Raphaël Junqueira]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Jason,
> Hi, When I can I use cvs diff, but once I get a few patches out I end up
> diffing to the previous patch using diff -u3 backup_of_last_patch
> dlls/d3d8.
>
> I always get lots of "Only in dlls/d3d8: basetexture.o, Only in
> dlls/d3d8: cubetexture.o etc" type lines - How can I get rid of these (I
> normally edit them out by hand but I forgot this time) - I looked in the
> man pages and nothing stood out.

diff --exclude=*.o or diff --exclude-from=regexp_file
> Jason

Regards,
Raphael

PS: you have done an amazing work on d3d8
Good job :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/pG6Cp7NA3AmQTU4RAlFJAKCFq08/FAPyIKFFehzPSJ9qlBEqdACdGWpm
/dYdYSVqPsPdWF+BRBBHXGo=
=ENbD
-----END PGP SIGNATURE-----