Conflicts while importing

[Stefan Schulze]

Hi!
I tried to import an existing project (~10MB) consist of binary and
non-binary files.
While importing I got some conflicts but I don't know the causes. Some
examples are:

Entry state: Warning
Description: File has some escape characters in it (0x00-0x20,
0x80-0xFF)
The causing files are Java-source files and HTML-files

Entry state: OK (with yellow warning-sign)
Entry description: Type *.id / Type *.pas / Type *.cfg and some more
(lots of occurences)

At the second problem, I think, that these file-extensions are unknown
to CVS and I should told it, whether it is binary or text. But there are
a lot of different possibilities (Leave unchanged, Force binary, Force
text, Force no keywords expansion, Ignore) to choose and I don't know,
which one is the the best choice.

It's the first time I have to import an existing project to a new
repository and I use WinCVS with CVS 1.10

I hope that anybody can help me...

CU
Stefan
--
Also, wenn die Mehrheit dämlich ist [...], wird es nicht besser,
wenn ich die auch noch alle vernetze, sorry....
[Thomas Schmidt in de.sci.informatik.misc]

[Daniel Berglund]

> While importing I got some conflicts but I don't know the causes. Some examples are: Entry state: Warning Description: File has some escape characters in it (0x00-0x20, 0x80-0xFF) The causing files are Java-source files and HTML-files

This always happens if you are using perfectly normal characters like åäöü
in comments, for example. Just ignore it, if you are sure that there are no
binary files among them.
Entry state: OK (with yellow warning-sign) Entry description: Type *.id / Type *.pas / Type *.cfg and some more (lots of occurences) At the second problem, I think, that these file-extensions are unknown to CVS and I should told it, whether it is binary or text. But there are a lot of different possibilities (Leave unchanged, Force binary, Force text, Force no keywords expansion, Ignore) to choose and I don't know, which one is the the best choice.

If you _know_ that all the files with a certain extension are text files,
choose 'force text', and if you _know_ they are binary, choose 'force
binary'. You can also choose 'leave unchanged' if WinCVS made a correct
guess as listed in the 'Entry kind' column. If you choose 'Ignore', files
with that particular extension will not be imported.

If you _know_ the files with a certain extension can be either binary _or_
text, then you have a problem and should find another way of naming those
files before importing.

[Thomas Dickey]

Daniel Berglund <pelarkaktus@hotmail.com> wrote: While importing I got some conflicts but I don't know the causes. Some examples are: Entry state: Warning Description: File has some escape characters in it (0x00-0x20, 0x80-0xFF) The causing files are Java-source files and HTML-files
This always happens if you are using perfectly normal characters like åäöü in comments, for example. Just ignore it, if you are sure that there are no binary files among them.

if you have to ignore the check, it's not doing a good job.
better: modify the check to allow 0xA0-0xFE.

--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net

[Stefan Schulze]

Thomas Dickey wrote: if you have to ignore the check, it's not doing a good job. better: modify the check to allow 0xA0-0xFE.

In which way should I modify the check?

CU
Stefan

--
Also, wenn die Mehrheit dämlich ist [...], wird es nicht besser,
wenn ich die auch noch alle vernetze, sorry....
[Thomas Schmidt in de.sci.informatik.misc]

[Jorgen Grahn]

On 22 Oct 2003 12:58:30 GMT, Thomas Dickey <dickey@saltmine.radix.net> wrote: Daniel Berglund <pelarkaktus@hotmail.com> wrote: While importing I got some conflicts but I don't know the causes. Some examples are: Entry state: Warning Description: File has some escape characters in it (0x00-0x20, 0x80-0xFF) The causing files are Java-source files and HTML-files This always happens if you are using perfectly normal characters like åäöü in comments, for example. Just ignore it, if you are sure that there are no binary files among them. if you have to ignore the check, it's not doing a good job. better: modify the check to allow 0xA0-0xFE.

I have to point out that this slightly bizarre test for "escape characters"
is not in vanilla CVS; it seems to be specific for WinCVS.

Tools like CVS, which rely on line matching to work, have /some/
requirements on the files they work with, but ASCII-only is not one of them.

/Jorgen

--
// Jorgen Grahn <jgrahn@ ''If All Men Were Brothers,
\X/ algonet.se> Would You Let One Marry Your Sister?''