Zabbix CVS problems

[vrtareg]

Hi Alexei

Today i try to checkout sources from sourceforge CVS as describet it in: http://sourceforge.net/cvs/?group_id=23494

I noticed that there are problems with many binary files like images and executables.
It seems that them commited in text mode.
Many GIF, PNG files are damaged.
When i checkout project on Windows i see that in GIF and PNG files before "0x0A" byte added "0x0D" byte.

Can someone correct this?

Thanks
Areg

[Alexei]

It is obviously problem with your CVS client setup. ZABBIX CVS does contain correct binary data.

[vrtareg]

Hi

when you commit some data to CVS it assume that you want to commit ascii data.
If you want to commit some binary information and you want to leave it unchanged in CVS you need to add it with -kb switch to be sure that CVS assume this data as binary not ascii.
I work with CVS more than 4 years and i know about this issue.
You can create special file in CVS main repo which will contain the main information about file types like this:

-------------- CVS wrapper file ---------------------------------------
# This file affects handling of files based on their names.
#
# The -m option specifies whether CVS attempts to merge files.
#
# The -k option specifies keyword expansion (e.g. -kb for binary).
#
# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
#
# wildcard [option value][option value]...
#
# where option is one of
# -f from cvs filter value: path to filter
# -t to cvs filter value: path to filter
# -m update methodology value: MERGE or COPY
# -k expansion mode value: b, o, kkv, &c
#
# and value is a single-quote delimited value.
# For example:
#*.gif -k 'b'
----------------------------------------------------------------------

http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ

http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ#Can_I_set_cvs_to_treat_all_files_as_binary_by_default.3F

Regards
Areg

[vrtareg]

Hi Alexei

You can try to checkout CVS tree with the http://www.tortoisecvs.org/ CVS client and see that most of the images are damaged.

You can compare 2 attached files from the frontends\php\images\general directory.
One of them checked out in linux, another one in windows.
The file sizes are different.
If you compare them in binary mode you can see difference: in windows file you can see additional "0xoD" bytes.


Regards
Areg

[vrtareg]

Hi Alexei

Today i checked out CVS tree again and noticed that still most of images and media files are commited without "-kb" parameter which are present for the src/zabbix_agent_win32/Debug/ZabbixW32.exe and src/zabbix_agent_win32/Release/ZabbixW32.exe files (author hugetoad, http://zabbix.cvs.sourceforge.net/za...t_win32/Debug/, http://zabbix.cvs.sourceforge.net/za...in32/Release/).

This is strange to me.
How executables are commited whith "-kb" parameter but other binary files not?

Regards
Areg