Hi. I'm trying to commit a file and got this message. Does anybody
know how to fix it? Sending src/org/ofbiz/content/email/EmailServices.java Transmitting file data .subversion/libsvn_client/commit.c:873: (apr_err=135000) svn: Commit failed (details follow): subversion/libsvn_subr/subst.c:1235: (apr_err=135000) svn: File '/Users/sichen/Documents/workspace/ofbiz/applications/ content/src/org/ofbiz/content/email/EmailServices.java' has inconsistent newlines subversion/libsvn_subr/subst.c:643: (apr_err=135000) svn: Inconsistent line ending style _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
Si,
have you tried to add a carriage return at the end of the patch? Jacopo Si Chen wrote: > Hi. I'm trying to commit a file and got this message. Does anybody > know how to fix it? > > Sending src/org/ofbiz/content/email/EmailServices.java > Transmitting file data .subversion/libsvn_client/commit.c:873: > (apr_err=135000) > svn: Commit failed (details follow): > subversion/libsvn_subr/subst.c:1235: (apr_err=135000) > svn: File '/Users/sichen/Documents/workspace/ofbiz/applications/ > content/src/org/ofbiz/content/email/EmailServices.java' has > inconsistent newlines > subversion/libsvn_subr/subst.c:643: (apr_err=135000) > svn: Inconsistent line ending style > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev > _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
In reply to this post by Si Chen-2
Si, Most (good) editors have something to convert line endings in text files. Just run this on the file to convert all line endings to a certain one (preferably the default on your OS). In Eclipse it is in the menu item "File -> Convert Line Delimiters To". -David Si Chen wrote: > Hi. I'm trying to commit a file and got this message. Does anybody > know how to fix it? > > Sending src/org/ofbiz/content/email/EmailServices.java > Transmitting file data .subversion/libsvn_client/commit.c:873: > (apr_err=135000) > svn: Commit failed (details follow): > subversion/libsvn_subr/subst.c:1235: (apr_err=135000) > svn: File '/Users/sichen/Documents/workspace/ofbiz/applications/ > content/src/org/ofbiz/content/email/EmailServices.java' has > inconsistent newlines > subversion/libsvn_subr/subst.c:643: (apr_err=135000) > svn: Inconsistent line ending style > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
Administrator
|
In reply to this post by Si Chen-2
On Windows I'd use Ultraedit conversion option to standardize end of lines
(either to Linux or DOS). Ha ! Scite does that also (so either on WIndows or Linux). Jacques > Hi. I'm trying to commit a file and got this message. Does anybody > know how to fix it? > > Sending src/org/ofbiz/content/email/EmailServices.java > Transmitting file data .subversion/libsvn_client/commit.c:873: > (apr_err=135000) > svn: Commit failed (details follow): > subversion/libsvn_subr/subst.c:1235: (apr_err=135000) > svn: File '/Users/sichen/Documents/workspace/ofbiz/applications/ > content/src/org/ofbiz/content/email/EmailServices.java' has > inconsistent newlines > subversion/libsvn_subr/subst.c:643: (apr_err=135000) > svn: Inconsistent line ending style > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
In reply to this post by Si Chen-2
do you have and editor that will let you see the CR LF symbols.
in linux only the lf is used. Si Chen sent the following on 6/20/06 12:39 PM: > Hi. I'm trying to commit a file and got this message. Does anybody > know how to fix it? > > Sending src/org/ofbiz/content/email/EmailServices.java > Transmitting file data .subversion/libsvn_client/commit.c:873: > (apr_err=135000) > svn: Commit failed (details follow): > subversion/libsvn_subr/subst.c:1235: (apr_err=135000) > svn: File '/Users/sichen/Documents/workspace/ofbiz/applications/ > content/src/org/ofbiz/content/email/EmailServices.java' has > inconsistent newlines > subversion/libsvn_subr/subst.c:643: (apr_err=135000) > svn: Inconsistent line ending style > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev > _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
In reply to this post by Jacques Le Roux
Thanks everybody! I used David's suggestion for Eclipse and fixed
it. It is committed now in SVN r 7829. Si On Jun 20, 2006, at 12:50 PM, Jacques Le Roux wrote: > On Windows I'd use Ultraedit conversion option to standardize end > of lines > (either to Linux or DOS). Ha ! Scite does that also (so either on > WIndows or > Linux). > > Jacques > > >> Hi. I'm trying to commit a file and got this message. Does anybody >> know how to fix it? >> >> Sending src/org/ofbiz/content/email/EmailServices.java >> Transmitting file data .subversion/libsvn_client/commit.c:873: >> (apr_err=135000) >> svn: Commit failed (details follow): >> subversion/libsvn_subr/subst.c:1235: (apr_err=135000) >> svn: File '/Users/sichen/Documents/workspace/ofbiz/applications/ >> content/src/org/ofbiz/content/email/EmailServices.java' has >> inconsistent newlines >> subversion/libsvn_subr/subst.c:643: (apr_err=135000) >> svn: Inconsistent line ending style >> >> _______________________________________________ >> Dev mailing list >> [hidden email] >> http://lists.ofbiz.org/mailman/listinfo/dev > > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
Free forum by Nabble | Edit this page |