-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Had this once, too.
That means the file(s) you want to commit contains both CR and CRLF line
endings.
I converted the whole file to one line ending scheme and things were fine.
Greetings,
M
Soeren Gerlach schrieb:
| Hi Everyong,
|
| I just migrated a small CVS to an Subversion repository (smile smile ,-))
| which is used mixed on Unix (Linux, Solaris) as well as in an Windows
| environment.
| I made the import on the unix side with auto-props set as following:
|
| -------------------------------------------------------------------
| [auto-props]
| Makefile = svn:eol-style=native
| *.cpp = svn:keywords="LastChangedDate LastChangedRevision LastChangedBy
| Id";svn:eol-style=native
| *.h = svn:keywords="LastChangedDate LastChangedRevision LastChangedBy
| Id";svn:eol-style=native
| *.c = svn:keywords="LastChangedDate LastChangedRevision LastChangedBy
| Id";svn:eol-style=native
| *.sh = svn:eol-style=native;svn:executable
| *.dsp = svn:eol-style=CRLF
| *.dsw = svn:eol-style=CRLF
| -------------------------------------------------------------------
|
| I was able to check out everything on the Windows side and also add some
| additional files, cpp files as well as other files.
| The problem came up when I changed a .cpp file on the Windows side and
| wanted to commit this change: I was faced with the error message
|
| -------------------------------------------------------------------
|
|>svn commit CPL_xlw.cpp
|
| Sending XLW\CPL_xlw.cpp
| Transmitting file data .svn: Commit failed (details follow):
| svn: Inconsistent line-endings in source stream
| svn: Your commit message was left in a temporary file:
| svn: 'C:/MyProjects/cpl_barrier/svn-commit.2.tmp'
| -------------------------------------------------------------------
|
| I searched mailing lists, the SVN book and the FAQ but wasn't able to find
| a hind what the problem might be. I also exhanged the editor settings,
| using wordpad instead of notepad and also providing the commit message
| with the "-m" parameter directly, but this didn't change anything. It just
| looks like svn has a problem with converting line endings of the source
| file but this shouldn't be a problem at all for my understanding?
| The auto props are defined for the windows client exactly as for the Unix
| client.
| Os yes: And I'm running version 1.0 for server and clients.
|
|
| Thanks,
| Soeren Gerlach
|
|
| ---------------------------------------------------------------------
| To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
| For additional commands, e-mail: users-help@subversion.tigris.org
|
|
- --
/**********************************************************
~ Thanx, the "GR_FRameRAM8" is much more elegant than a
~ mere "19", naturally.
~ mailto:marcus.rohrmoser@gmx.de
~ http://marcusr.gmxhome.de/
Zu Infos über email Verschlüsselung mit GnuPG/PGP siehe
http://www.gnupp.de
**********************************************************/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFAcq4X3wDNYFytWz8RAoWpAKC+MySzSIi8fjeItZ93eOHDGhz7FwCfbY6T
i4aU5UZ79/53bmAcFOcwCR8=
=Br5p
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 6 15:19:07 2004