[PHP-CVS] cvs: CVSROOT / cvswrappers
gobaSat Jan 18 11:54:16 2003 EDT Modified files: /CVSROOTcvswrappers Log: Uh, tif and eps should not be diffed / merged Index: CVSROOT/cvswrappers diff -u CVSROOT/cvswrappers:1.7 CVSROOT/cvswrappers:1.8 --- CVSROOT/cvswrappers:1.7 Mon Jan 13 16:18:28 2003 +++ CVSROOT/cvswrappers Sat Jan 18 11:54:15 2003 @@ -1,5 +1,5 @@ # -#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.7 2003/01/13 21:18:28 goba Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.8 2003/01/18 16:54:15 goba +Exp $ # # This file describes wrappers and other binary files to CVS. # @@ -50,3 +50,5 @@ *.chm -k 'b' -m 'COPY' *.tar -k 'b' -m 'COPY' *.bz2 -k 'b' -m 'COPY' +*.tif -k 'b' -m 'COPY' +*.eps -k 'b' -m 'COPY' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / cvswrappers
gobaSat Jan 18 15:06:21 2003 EDT Modified files: /CVSROOTcvswrappers Log: tgz files are also binaries... Index: CVSROOT/cvswrappers diff -u CVSROOT/cvswrappers:1.8 CVSROOT/cvswrappers:1.9 --- CVSROOT/cvswrappers:1.8 Sat Jan 18 11:54:15 2003 +++ CVSROOT/cvswrappers Sat Jan 18 15:06:19 2003 @@ -1,5 +1,5 @@ # -#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.8 2003/01/18 16:54:15 goba Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.9 2003/01/18 20:06:19 goba +Exp $ # # This file describes wrappers and other binary files to CVS. # @@ -52,3 +52,4 @@ *.bz2 -k 'b' -m 'COPY' *.tif -k 'b' -m 'COPY' *.eps -k 'b' -m 'COPY' +*.tgz -k 'b' -m 'COPY' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / cvswrappers
goba Sun Jan 12 12:40:05 2003 EDT Modified files: /CVSROOT cvswrappers Log: OK, two *.dsw and two *.zip is a bit too much :) .dsw (Visual Studio workspace) files are plain text files. Well, there were two *.dsw entires there already. I have removed one from them... Maybe it is also used for something binary... Goba -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / cvswrappers
On Mon, 13 Jan 2003, Gabor Hojtsy wrote: goba Sun Jan 12 12:40:05 2003 EDT Modified files: /CVSROOT cvswrappers Log: OK, two *.dsw and two *.zip is a bit too much :) .dsw (Visual Studio workspace) files are plain text files. Well, there were two *.dsw entires there already. I have removed one from them... Maybe it is also used for something binary... Not really... and now I also understand why I got those weird can not merge warnings with .dsw files. I'm +1 on removing the binary state on this. Derick -- - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / cvswrappers
gobaSun Jan 12 12:28:30 2003 EDT Modified files: /CVSROOTcvswrappers Log: Add some more compressed formats to be handled binary, and not to be diffed... Index: CVSROOT/cvswrappers diff -u CVSROOT/cvswrappers:1.4 CVSROOT/cvswrappers:1.5 --- CVSROOT/cvswrappers:1.4 Mon Apr 2 11:03:11 2001 +++ CVSROOT/cvswrappers Sun Jan 12 12:28:30 2003 @@ -1,5 +1,5 @@ # -#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.4 2001/04/02 15:03:11 rasmus Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.5 2003/01/12 17:28:30 goba +Exp $ # # This file describes wrappers and other binary files to CVS. # @@ -50,3 +50,6 @@ *.lha -k 'b' -m 'COPY' *.pdf -k 'b' -m 'COPY' *.chm -k 'b' -m 'COPY' +*.tar -k 'b' -m 'COPY' +*.bz2 -k 'b' -m 'COPY' +*.zip -k 'b' -m 'COPY' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / cvswrappers
gobaSun Jan 12 12:40:05 2003 EDT Modified files: /CVSROOTcvswrappers Log: OK, two *.dsw and two *.zip is a bit too much :) Index: CVSROOT/cvswrappers diff -u CVSROOT/cvswrappers:1.5 CVSROOT/cvswrappers:1.6 --- CVSROOT/cvswrappers:1.5 Sun Jan 12 12:28:30 2003 +++ CVSROOT/cvswrappers Sun Jan 12 12:40:05 2003 @@ -1,5 +1,5 @@ # -#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.5 2003/01/12 17:28:30 goba Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.6 2003/01/12 17:40:05 goba +Exp $ # # This file describes wrappers and other binary files to CVS. # @@ -33,7 +33,6 @@ *.png -k 'b' -m 'COPY' *.gz -k 'b' -m 'COPY' *.dsw -k 'b' -m 'COPY' -*.dsw -k 'b' -m 'COPY' *.dsp -k 'b' -m 'COPY' *.zip -k 'b' -m 'COPY' *.ide -k 'b' -m 'COPY' @@ -52,4 +51,3 @@ *.chm -k 'b' -m 'COPY' *.tar -k 'b' -m 'COPY' *.bz2 -k 'b' -m 'COPY' -*.zip -k 'b' -m 'COPY' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / cvswrappers
On Sun, Jan 12, 2003 at 05:40:05PM -, Gabor Hojtsy wrote: goba Sun Jan 12 12:40:05 2003 EDT Modified files: /CVSROOT cvswrappers Log: OK, two *.dsw and two *.zip is a bit too much :) .dsw (Visual Studio workspace) files are plain text files. -- Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
