Vivek Payala wrote:
> Hi Lubbe,
>
>
>
> Thanks for your reply. We use Eclipse as the editor. And the file on
> which the error is coming is an HTML file. If I remove the svn:eol style
> property which is currently set to ‘native’ on these HTML files, the
> commit goes through. But is removing this property a solution to it?
>
Not really. What you've committed has mixed line endings. The
eol-style properties will convert line endings but not if they are
mixed. With no eol-style set, Subversion doesn't care what sort of line
endings you have, but a web-browser might do.
1) Use something like dos2unix / unix2dos to convert the line endings of
the file, you will then have consistent throughout.
2) re apply the property
3) commit
Unless eclipse is changing your line endings it should be OK from there on.
>
>
> *Thanks,*
>
> * *
>
> *Vivek Payala **|** Group Lead – Configuration Management (Professional
> & Managed Services Group) **|** Persistent Systems*
>
> *vivek_payala_at_persistent.co.in*
> <mailto:milind_kharkar_at_persistent.co.in>* **|
> **Cell: +91 93701 31472 **| **Tel: +91 (20) 3023 6447*
>
> *Innovation in software product design, development and delivery-
> **www.persistentsys.com* <http://www.persistentsys.com/>
>
>
>
> *From:* Lübbe Onken | RA Consulting
> [mailto:l.onken_at_rac.de]
> *Sent:* Tuesday, June 17, 2008 3:18 PM
> *To:* users_at_tortoisesvn.tigris.org
> *Subject:* RE: Committing HTML files gives 'inconsistent newlines' error
>
>
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi Vivek
>
> set the svn:eol style property an all text files to native. This will
> ensure that the file is checked out with consistent newlines. Then make
> sure that you use an editor which doesn't change the newlines while you
> edit the files. To fix the error, open the file in a text editor that
> allows you to set the eol-style (PSPad for example), edit and save the
> file again.
>
> It is also a good idea to set the svn:mime type property to a correct value.
>
> Cheers
> - -Lübbe
>
>
> ________________________________
>
> From: Vivek Payala [mailto:vivek_payala_at_persistent.co.in
> <mailto:vivek_payala_at_persistent.co.in>]
> Sent: Tuesday, June 17, 2008 11:42 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: Committing HTML files gives 'inconsistent newlines' error
>
>
>
> Hello,
>
>
>
> While committing the locally updated javadocs to the SVN
> repository using TortoiseSVN, I am facing the following error,
>
>
>
> Error: Commit failed (details follow):
>
> Error: File 'F:\svn_roots\clientapi\doc\apidoc\index-all.html'
> has inconsistent newlines
>
> Error: Inconsistent line ending style
>
>
>
> Please help me in identifying and fixing the problem.
>
>
>
>
>
> Thanks,
>
>
>
> Vivek Payala | Group Lead – Configuration Management
> (Professional & Managed Services Group) | Persistent Systems
>
> vivek_payala_at_persistent.co.in
> <mailto:milind_kharkar_at_persistent.co.in
> <mailto:milind_kharkar_at_persistent.co.in>> |
> Cell: +91 93701 31472 | Tel: +91 (20) 3023 6447
>
> Innovation in software product design, development and delivery-
> www.persistentsys.com <http://www.persistentsys.com/>
>
> DISCLAIMER ========== This e-mail may contain privileged and
> confidential information which is the property of Persistent Systems
> Ltd. It is intended only for the use of the individual or entity to
> which it is addressed. If you are not the intended recipient, you are
> not authorized to read, retain, copy, print, distribute or use this
> message. If you have received this communication in error, please notify
> the sender and delete all copies of this message. Persistent Systems
> Ltd. does not accept any liability for virus infected mails.
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.7 (MingW32)
>
> iD8DBQFIV4hcm8gezyP1EasRAqoLAJ9qZpWcZnenwHab/XJ7mxTSLpALpQCfTc2O
> QRnTi30U6qIenoQHt/lY0AE=
> =b1UX
> -----END PGP SIGNATURE-----
>
> DISCLAIMER ========== This e-mail may contain privileged and
> confidential information which is the property of Persistent Systems
> Ltd. It is intended only for the use of the individual or entity to
> which it is addressed. If you are not the intended recipient, you are
> not authorized to read, retain, copy, print, distribute or use this
> message. If you have received this communication in error, please notify
> the sender and delete all copies of this message. Persistent Systems
> Ltd. does not accept any liability for virus infected mails.
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-17 13:40:29 CEST